Attachment #85583 for issue #126891

View | Details | Raw Unified | Return to issue 126891
Collapse All | Expand All

Lines 313-321 Link Here

(-)main/external_deps.lst (-3 / +3 lines)
313	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)	313	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
314		314
315	if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES)	315	if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES)
316	MD5 = 067a04150b1d8b64f7da3019688a7547	316	MD5 = a668a0df123bbb57ee14820dd61151e0
317	name = nss-3.14.4-with-nspr-4.9.5.tar.gz	317	name = nss-3.24-with-nspr-4.12.tar.gz
318	URL1 = https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_14_4_RTM/src/$(name)	318	URL1 = https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_24_RTM/src/$(name)
319	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)	319	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
320		320
321	if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE)	321	if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE)





.ELSE

TARFILE_NAME=nss-3.24-with-nspr-4.12
TARFILE_MD5=a668a0df123bbb57ee14820dd61151e0
TARFILE_ROOTDIR=nss-3.24
PATCH_FILES=nss.patch

.IF "$(OS)"=="MACOSX"

PATCH_FILES+=nss_macosx.patch
.ENDIF # "$(OS)"=="MACOSX"

.IF "$(OS)"=="FREEBSD"
PATCH_FILES+=nss_freebsd.patch
.ENDIF

.IF "$(debug)" != ""
.ELSE
BUILD_OPT=1

.EXPORT : USE_64
.ENDIF # "$(BUILD64)"=="1"

OUT2LIB=dist$/out$/lib$/*$(DLLPOST)

BUILD_DIR=nss
BUILD_ACTION= $(GNUMAKE) nss_build_all
#See #i105566# && moz#513024#
.IF "$(OS)"=="LINUX"
BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1
PATCH_FILES+=nss_linux.patch
.ENDIF

.IF "$(OS)"=="FREEBSD"
BUILD_ACTION+=FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1
.ENDIF


.IF "$(GUI)"=="WNT"

.IF "$(COM)"=="GCC"

.ENDIF


BUILD_DIR=nss
BUILD_ACTION= NSS_DISABLE_GTESTS=1 NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all

OUT2LIB= \
	dist$/out$/lib$/libnspr4.a \
	dist$/out$/lib$/libnss3.a \
	dist$/out$/lib$/libnssdbm3.a \
	dist$/out$/lib$/libnssutil3.a \
	dist$/out$/lib$/libplc4.a \
	dist$/out$/lib$/libplds4.a \
	dist$/out$/lib$/libsmime3.a \
	dist$/out$/lib$/libsoftokn3.a \
	dist$/out$/lib$/libsqlite3.a \
	dist$/out$/lib$/libssl3.a

.ELSE			# "$(COM)"=="GCC"
MOZ_MSVCVERSION= 9

EXT_USE_STLPORT=TRUE

#To build nss one has to call "make nss_build_all" in 
#nss
NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/nss)
BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/moztools/bin" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
	-c "cd $(NSS_BUILD_DIR) && make nss_build_all NSS_DISABLE_GTESTS=1"

OUT2LIB= \
	dist$/out$/lib$/nspr4.lib \
	dist$/out$/lib$/nss3.lib \
	dist$/out$/lib$/nssdbm3.lib \
	dist$/out$/lib$/nssutil3.lib \
	dist$/out$/lib$/plc4.lib \
	dist$/out$/lib$/plds4.lib \
	dist$/out$/lib$/smime3.lib \
	dist$/out$/lib$/softokn3.lib \
	dist$/out$/lib$/sqlite3.lib \
	dist$/out$/lib$/ssl3.lib

.ENDIF			# "$(COM)"=="GCC"

OUT2BIN=dist$/out$/lib$/*$(DLLPOST)
.ENDIF			# "$(GUI)"=="WNT"


OUTDIR2INC=dist$/public$/nss dist$/out$/include

# --- Targets ------------------------------------------------------


Lines 1-6 Link Here

(-)main/nss/nss.patch

Lines 14-22 Link Here

(-)- misc/nss-3.14.4/mozilla/nsprpub/config/rules.mk
14	endif # GCC	15	endif # GCC
15	@echo $(RES) finished	16	@echo $(RES) finished
16	endif	17	endif

Lines 25-35 Link Here

(-)- misc/nss-3.14.4/mozilla/nsprpub/configure
25	_OPTIMIZE_FLAGS=-O2	27	_OPTIMIZE_FLAGS=-O2
26	_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that	28	_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that
27	# combo is not yet good at debugging inlined	29	# combo is not yet good at debugging inlined

Lines 43-50 Link Here

(-)- misc/nss-3.14.4/mozilla/security/coreconf/Darwin.mk
43	RANLIB = ranlib	120	RANLIB = ranlib
44		121
45	ifndef CPU_ARCH	122	ifndef CPU_ARCH




 RANLIB			= ranlib
 
 DEFAULT_COMPILER = gcc
@@ -139,7 +142,7 @@
 OS_PTHREAD = -lpthread 
 endif
 
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR
+OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR -DHAVE_UNISTD_H
 OS_LIBS			= $(OS_PTHREAD) -ldl -lc
 
 ifdef USE_PTHREADS
@@ -149,7 +152,7 @@
 ARCH			= linux
 
 DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		= -shared $(ARCHFLAG) -Wl,--gc-sections
+DSO_LDOPTS		= -shared $(ARCHFLAG) -Wl,--gc-sections '-Wl,-rpath,$$ORIGIN'
 # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
 # incorrectly reports undefined references in the libraries we link with, so
 # we don't use -z defs there.
@@ -189,8 +192,13 @@
-DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
+DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN'
 LDFLAGS			+= $(ARCHFLAG)
 
 # On Maemo, we need to use the -rpath-link flag for even the standard system
@@ -174,8 +177,13 @@
 endif
 endif
 

 
 # The -rpath '$$ORIGIN' linker option instructs this library to search for its
 # dependencies in the same directory where it resides.

Lines 99-123 Link Here

(-)- misc/nss-3.14.4/mozilla/security/coreconf/SunOS5.mk
99	ASFLAGS += -Wa,-P	211	ASFLAGS += -Wa,-P
100	OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)	212	OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
101	ifndef BUILD_OPT	213	ifndef BUILD_OPT

Lines 131-179 Link Here

(-)- misc/nss-3.14.4/mozilla/security/coreconf/rules.mk
131	endif	245	endif
132	@echo $(RES) finished	246	@echo $(RES) finished
133	endif	247	endif

Lines 1-5 Link Here

(-)main/nss/nss_freebsd.patch

Lines 1-24 Link Here

(-)main/nss/nss_linux.patch

Lines 1-18 Link Here

(-)main/nss/nss_macosx.patch

Lines 23-27 Link Here

(-)- misc/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk (-1 / +1 lines)
23	+OSX_MINOR_LT_5 := $(shell [ $(OSX_TARGET_MINOR) -lt 5 ] && echo true)	12	+OSX_MINOR_LT_5 := $(shell [ $(OSX_TARGET_MINOR) -lt 5 ] && echo true)
24	+ifeq ($(OSX_MINOR_LT_5),true)	13	+ifeq ($(OSX_MINOR_LT_5),true)
25	OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC	14	OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC
		15	endif
26	endif # Darwin	16	endif # Darwin
27	endif

Return to issue 126891

Lines 39-47 Link Here

(-)main/nss/makefile.mk (-37 / +37 lines)
39		39
40	.ELSE	40	.ELSE
41		41
42	TARFILE_NAME=nss-3.14.4-with-nspr-4.9.5	42	TARFILE_NAME=nss-3.24-with-nspr-4.12
43	TARFILE_MD5=067a04150b1d8b64f7da3019688a7547	43	TARFILE_MD5=a668a0df123bbb57ee14820dd61151e0
44	TARFILE_ROOTDIR=nss-3.14.4	44	TARFILE_ROOTDIR=nss-3.24
45	PATCH_FILES=nss.patch	45	PATCH_FILES=nss.patch
46		46
47	.IF "$(OS)"=="MACOSX"	47	.IF "$(OS)"=="MACOSX"
Lines 50-59 Link Here
50	PATCH_FILES+=nss_macosx.patch	50	PATCH_FILES+=nss_macosx.patch
51	.ENDIF # "$(OS)"=="MACOSX"	51	.ENDIF # "$(OS)"=="MACOSX"
52		52
53	.IF "$(OS)"=="FREEBSD"
54	PATCH_FILES+=nss_freebsd.patch
55	.ENDIF
56
57	.IF "$(debug)" != ""	53	.IF "$(debug)" != ""
58	.ELSE	54	.ELSE
59	BUILD_OPT=1	55	BUILD_OPT=1
Lines 66-82 Link Here
66	.EXPORT : USE_64	62	.EXPORT : USE_64
67	.ENDIF # "$(BUILD64)"=="1"	63	.ENDIF # "$(BUILD64)"=="1"
68		64
69	OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST)	65	OUT2LIB=dist$/out$/lib$/*$(DLLPOST)
70		66
71	BUILD_DIR=mozilla$/security$/nss	67	BUILD_DIR=nss
72	BUILD_ACTION= $(GNUMAKE) nss_build_all	68	BUILD_ACTION= $(GNUMAKE) nss_build_all
73	#See #i105566# && moz#513024#	69	#See #i105566# && moz#513024#
74	.IF "$(OS)"=="LINUX"	70	.IF "$(OS)"=="LINUX"
75	BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1	71	BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1
76	PATCH_FILES+=nss_linux.patch	72	PATCH_FILES+=nss_linux.patch
77	.ENDIF	73	.ENDIF
78		74
		75	.IF "$(OS)"=="FREEBSD"
		76	BUILD_ACTION+=FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1
		77	.ENDIF
79		78
		79
80	.IF "$(GUI)"=="WNT"	80	.IF "$(GUI)"=="WNT"
81		81
82	.IF "$(COM)"=="GCC"	82	.IF "$(COM)"=="GCC"
Lines 99-118 Link Here
99	.ENDIF	99	.ENDIF
100		100
101		101
102	BUILD_DIR=mozilla$/security$/nss	102	BUILD_DIR=nss
103	BUILD_ACTION=NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all	103	BUILD_ACTION= NSS_DISABLE_GTESTS=1 NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all
104		104
105	OUT2LIB= \	105	OUT2LIB= \
106	mozilla$/dist$/out$/lib$/libnspr4.a \	106	dist$/out$/lib$/libnspr4.a \
107	mozilla$/dist$/out$/lib$/libnss3.a \	107	dist$/out$/lib$/libnss3.a \
108	mozilla$/dist$/out$/lib$/libnssdbm3.a \	108	dist$/out$/lib$/libnssdbm3.a \
109	mozilla$/dist$/out$/lib$/libnssutil3.a \	109	dist$/out$/lib$/libnssutil3.a \
110	mozilla$/dist$/out$/lib$/libplc4.a \	110	dist$/out$/lib$/libplc4.a \
111	mozilla$/dist$/out$/lib$/libplds4.a \	111	dist$/out$/lib$/libplds4.a \
112	mozilla$/dist$/out$/lib$/libsmime3.a \	112	dist$/out$/lib$/libsmime3.a \
113	mozilla$/dist$/out$/lib$/libsoftokn3.a \	113	dist$/out$/lib$/libsoftokn3.a \
114	mozilla$/dist$/out$/lib$/libsqlite3.a \	114	dist$/out$/lib$/libsqlite3.a \
115	mozilla$/dist$/out$/lib$/libssl3.a	115	dist$/out$/lib$/libssl3.a
116		116
117	.ELSE # "$(COM)"=="GCC"	117	.ELSE # "$(COM)"=="GCC"
118	MOZ_MSVCVERSION= 9	118	MOZ_MSVCVERSION= 9
Lines 130-159 Link Here
130	EXT_USE_STLPORT=TRUE	130	EXT_USE_STLPORT=TRUE
131		131
132	#To build nss one has to call "make nss_build_all" in	132	#To build nss one has to call "make nss_build_all" in
133	#mozilla/security/nss	133	#nss
134	NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss)	134	NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/nss)
135	BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/moztools/bin" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \	135	BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/moztools/bin" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
136	-c "cd $(NSS_BUILD_DIR) && make nss_build_all"	136	-c "cd $(NSS_BUILD_DIR) && make nss_build_all NSS_DISABLE_GTESTS=1"
137		137
138	OUT2LIB= \	138	OUT2LIB= \
139	mozilla$/dist$/out$/lib$/nspr4.lib \	139	dist$/out$/lib$/nspr4.lib \
140	mozilla$/dist$/out$/lib$/nss3.lib \	140	dist$/out$/lib$/nss3.lib \
141	mozilla$/dist$/out$/lib$/nssdbm3.lib \	141	dist$/out$/lib$/nssdbm3.lib \
142	mozilla$/dist$/out$/lib$/nssutil3.lib \	142	dist$/out$/lib$/nssutil3.lib \
143	mozilla$/dist$/out$/lib$/plc4.lib \	143	dist$/out$/lib$/plc4.lib \
144	mozilla$/dist$/out$/lib$/plds4.lib \	144	dist$/out$/lib$/plds4.lib \
145	mozilla$/dist$/out$/lib$/smime3.lib \	145	dist$/out$/lib$/smime3.lib \
146	mozilla$/dist$/out$/lib$/softokn3.lib \	146	dist$/out$/lib$/softokn3.lib \
147	mozilla$/dist$/out$/lib$/sqlite3.lib \	147	dist$/out$/lib$/sqlite3.lib \
148	mozilla$/dist$/out$/lib$/ssl3.lib	148	dist$/out$/lib$/ssl3.lib
149		149
150	.ENDIF # "$(COM)"=="GCC"	150	.ENDIF # "$(COM)"=="GCC"
151		151
152	OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST)	152	OUT2BIN=dist$/out$/lib$/*$(DLLPOST)
153	.ENDIF # "$(GUI)"=="WNT"	153	.ENDIF # "$(GUI)"=="WNT"
154		154
155		155
156	OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include	156	OUTDIR2INC=dist$/public$/nss dist$/out$/include
157		157
158	# --- Targets ------------------------------------------------------	158	# --- Targets ------------------------------------------------------
159		159