Annotation of /trunk/mozilla-firefox/patches/mozilla-firefox-1.0.7-nss-system-nspr.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 4412 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 4412 byte(s)
-import
1 | niro | 153 | Index: mozilla/security/coreconf/location.mk |
2 | =================================================================== | ||
3 | RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v | ||
4 | retrieving revision 1.9 | ||
5 | diff -u -r1.9 location.mk | ||
6 | --- mozilla/security/coreconf/location.mk 25 Apr 2004 15:02:17 -0000 1.9 | ||
7 | +++ mozilla/security/coreconf/location.mk 11 Apr 2005 20:21:57 -0000 | ||
8 | @@ -61,6 +61,8 @@ | ||
9 | |||
10 | DIST = $(SOURCE_PREFIX)/$(PLATFORM) | ||
11 | |||
12 | +NSPR_LIBDIR = $(DIST)/lib | ||
13 | + | ||
14 | ifdef BUILD_DEBUG_GC | ||
15 | DEFINES += -DDEBUG_GC | ||
16 | endif | ||
17 | Index: mozilla/security/manager/Makefile.in | ||
18 | =================================================================== | ||
19 | RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v | ||
20 | retrieving revision 1.56 | ||
21 | diff -u -r1.56 Makefile.in | ||
22 | --- mozilla/security/manager/Makefile.in 14 Mar 2005 10:00:58 -0000 1.56 | ||
23 | +++ mozilla/security/manager/Makefile.in 11 Apr 2005 20:21:57 -0000 | ||
24 | @@ -76,11 +76,22 @@ | ||
25 | endif | ||
26 | endif | ||
27 | |||
28 | +ABS_DIST := $(shell cd $(DIST) && pwd) | ||
29 | +ifeq ($(OS_ARCH),WINNT) | ||
30 | +ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g') | ||
31 | +endif | ||
32 | +NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS))) | ||
33 | +ifneq (,$(strip $(NSPR_LIBDIR))) | ||
34 | +NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR))) | ||
35 | +else | ||
36 | +NSPR_LIBDIR = $(ABS_DIST)/lib | ||
37 | +endif | ||
38 | # NSS makefiles are not safe for parallel execution. | ||
39 | DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 | ||
40 | -DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm" | ||
41 | -DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist | ||
42 | -DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist | ||
43 | +DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)" | ||
44 | +DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) | ||
45 | +DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) | ||
46 | +DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR) | ||
47 | DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 | ||
48 | DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 | ||
49 | ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) | ||
50 | Index: mozilla/security/nss/lib/ckfw/builtins/Makefile | ||
51 | =================================================================== | ||
52 | RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v | ||
53 | retrieving revision 1.14 | ||
54 | diff -u -r1.14 Makefile | ||
55 | --- mozilla/security/nss/lib/ckfw/builtins/Makefile 20 Jan 2005 02:25:46 -0000 1.14 | ||
56 | +++ mozilla/security/nss/lib/ckfw/builtins/Makefile 11 Apr 2005 20:21:57 -0000 | ||
57 | @@ -53,23 +53,23 @@ | ||
58 | # This is merely an expedient hack and not the right solution. | ||
59 | ifdef NS_USE_GCC | ||
60 | EXTRA_LIBS += \ | ||
61 | - -L$(DIST)/lib \ | ||
62 | + -L$(NSPR_LIBDIR) \ | ||
63 | -lplc4 \ | ||
64 | -lplds4 \ | ||
65 | -lnspr4 \ | ||
66 | $(NULL) | ||
67 | else | ||
68 | EXTRA_LIBS += \ | ||
69 | - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ | ||
70 | - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ | ||
71 | + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \ | ||
72 | + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \ | ||
73 | $(NULL) | ||
74 | endif | ||
75 | |||
76 | else | ||
77 | |||
78 | EXTRA_LIBS += \ | ||
79 | - $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ | ||
80 | - $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ | ||
81 | + $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ | ||
82 | + $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ | ||
83 | $(NULL) | ||
84 | |||
85 | endif | ||
86 | Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile | ||
87 | =================================================================== | ||
88 | RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v | ||
89 | retrieving revision 1.18 | ||
90 | diff -u -r1.18 Makefile | ||
91 | --- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 25 Apr 2004 15:03:08 -0000 1.18 | ||
92 | +++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 11 Apr 2005 20:21:57 -0000 | ||
93 | @@ -63,7 +63,7 @@ | ||
94 | $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ | ||
95 | $(CRYPTO_LIB) \ | ||
96 | $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ | ||
97 | - -L$(DIST)/lib \ | ||
98 | + -L$(NSPR_LIBDIR) \ | ||
99 | -lplc4 \ | ||
100 | -lplds4 \ | ||
101 | -lnspr4 \ | ||
102 | @@ -76,8 +76,8 @@ | ||
103 | $(DIST)/lib/softokn.lib \ | ||
104 | $(CRYPTO_LIB) \ | ||
105 | $(DIST)/lib/secutil.lib \ | ||
106 | - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ | ||
107 | - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ | ||
108 | + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \ | ||
109 | + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \ | ||
110 | wsock32.lib \ | ||
111 | winmm.lib \ | ||
112 | $(NULL) | ||
113 | @@ -98,8 +98,8 @@ | ||
114 | $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ | ||
115 | $(CRYPTO_LIB) \ | ||
116 | $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ | ||
117 | - $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ | ||
118 | - $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ | ||
119 | + $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ | ||
120 | + $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ | ||
121 | $(NULL) | ||
122 | |||
123 | endif |