75300 - New include structure for NSPR builds, breaks PSM 2.0 builds on Linux.

Status: VERIFIED FIXED

(Core Graveyard :: Security: UI, defect)

Description

[Javier Delgadillo]

A change to client's build of NSPR causes PSM 2.0 builds to break.

Comment 1

[Nelson Bolyard (seldom reads bugmail)]

Attachment: Alternative fix for including NSPR headers in PSM build

Comment 2

[Javier Delgadillo]

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.

Comment 3

[Nelson Bolyard (seldom reads bugmail)]

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

Comment 4

[Javier Delgadillo]

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.

Comment 5

[Javier Delgadillo]

Attachment: patch that uses fix for WIN32 on all platforms for adding dist/include

Comment 6

[Javier Delgadillo]

Patch checked in.

Comment 7

[John Unruh]

Verified per javi's comments.