A change to client's build of NSPR causes PSM 2.0 builds to break.
Created attachment 30204 [details] [diff] [review] Alternative fix for including NSPR headers in PSM build
This patch solves the problem of getting NSPR header files, but now we can't get to DBM header files. dbm header files are in dist/include, NSPR headers are in dist/include/nspr We used to get both from dist/include, but now it's an either or.
OK, I now have a different (and hopefully better) understanding of the mozilla build environment than I had last night. I now understand that mozilla has one huge dist/include directory that includes many hundreds of files, and that only a very few of those files (namely NSPR's headers) have been moved out of dist/include. Previously, coreconf's variable for Machine Dependent (MD) headers (e.g. NSPR) was picking up all of mozilla's XP headers also, and coreconf's variable for picking up modules' XP headers was not previously picking up any headers. It only worked accidentally. When we changed the MD headers variable to point to NSPR's new directory, we no longer had anything pointing to dist/include. So, while mozilla persists in having the monolithic giant dist/include directory named $(PUBLIC), coreconf can easily accomodate it add this to the patch above. Index: headers.mk =================================================================== RCS file: /cvsroot/mozilla/security/coreconf/headers.mk,v retrieving revision 1.3 diff -u -r1.3 headers.mk --- headers.mk 2000/09/11 15:01:04 1.3 +++ headers.mk 2001/04/10 01:48:33 @@ -52,3 +52,7 @@ # INCLUDES += -I$(SOURCE_XPPRIVATE_DIR) + +ifdef PUBLIC +INCLUDES += -I$(CORE_DEPTH)/../$(PUBLIC) +endif
I just remembered that we, relyea and I, solved this exact problem, adding dist/include to coreconf's INCLUDE variables on WIN32. So the solution with the least impact would be take the WIN32 solution and make it a solution for all platforms. That solution appends dist/include to the INCLUDES iff MOZILLA_CLIENT is set. Will attach a patch shortly that incorporates nelsonb's original patch with the WIN32 solution applied globally.
Created attachment 30297 [details] [diff] [review] patch that uses fix for WIN32 on all platforms for adding dist/include
Patch checked in.
Status: NEW → RESOLVED
Last Resolved: 17 years ago
Resolution: --- → FIXED
Verified per javi's comments.
Status: RESOLVED → VERIFIED
You need to log in before you can comment on or make changes to this bug.