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

VERIFIED FIXED

Status

Core Graveyard
Security: UI
VERIFIED FIXED
17 years ago
2 years ago

People

(Reporter: Javier Delgadillo, Assigned: Javier Delgadillo)

Tracking

1.0 Branch
x86
Linux

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments)

(Assignee)

Description

17 years ago
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
(Assignee)

Comment 2

17 years ago
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
(Assignee)

Comment 4

17 years ago
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.
(Assignee)

Comment 5

17 years ago
Created attachment 30297 [details] [diff] [review]
patch that uses fix for WIN32 on all platforms for adding dist/include
(Assignee)

Comment 6

17 years ago
Patch checked in.
Status: NEW → RESOLVED
Last Resolved: 17 years ago
Resolution: --- → FIXED

Comment 7

17 years ago
Verified per javi's comments.
Status: RESOLVED → VERIFIED

Updated

13 years ago
Component: Security: UI → Security: UI
Product: PSM → Core

Updated

10 years ago
Version: psm2.0 → 1.0 Branch

Updated

6 years ago
Blocks: 774878

Updated

6 years ago
No longer blocks: 774878
Product: Core → Core Graveyard
You need to log in before you can comment on or make changes to this bug.