1*c38ced1bSHerbert Dürr--- misc/nss-3.14.4/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100 2*c38ced1bSHerbert Dürr+++ misc/build/nss-3.14.4/mozilla/nsprpub/config/rules.mk 2010-06-11 16:35:54.946870871 +0200 3*c38ced1bSHerbert Dürr@@ -377,7 +377,12 @@ 4cdf0e10cSrcweir ifdef NS_USE_GCC 5cdf0e10cSrcweir $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< 6cdf0e10cSrcweir else 7cdf0e10cSrcweir- $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $< 8cdf0e10cSrcweir+ #We remove stl from the paths to avoid that rc.exe finds the stlport of 9cdf0e10cSrcweir+ #OOo. stlport includes the system stl which will fail. By removing it, 10cdf0e10cSrcweir+ #rc will use the stl from the system if the path is in the INCLUDE 11cdf0e10cSrcweir+ #variable. 12cdf0e10cSrcweir+ INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $< 13cdf0e10cSrcweir+ 14cdf0e10cSrcweir endif # GCC 15cdf0e10cSrcweir @echo $(RES) finished 16cdf0e10cSrcweir endif 17*c38ced1bSHerbert Dürr--- misc/nss-3.14.4/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100 18*c38ced1bSHerbert Dürr+++ misc/build/nss-3.14.4/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200 19*c38ced1bSHerbert Dürr@@ -4443,7 +4443,7 @@ 20cdf0e10cSrcweir PR_MD_CSRCS=linux.c 21cdf0e10cSrcweir MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' 22cdf0e10cSrcweir DSO_CFLAGS=-fPIC 23cdf0e10cSrcweir- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' 24cdf0e10cSrcweir+ DSO_LDOPTS='-shared -Wl,-rpath,\$$ORIGIN -Wl,-soname -Wl,$(notdir $@)' 25cdf0e10cSrcweir _OPTIMIZE_FLAGS=-O2 26cdf0e10cSrcweir _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that 27cdf0e10cSrcweir # combo is not yet good at debugging inlined 28*c38ced1bSHerbert Dürr--- misc/nss-3.14.4/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100 29*c38ced1bSHerbert Dürr+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 30*c38ced1bSHerbert Dürr@@ -5,10 +5,12 @@ 31cdf0e10cSrcweir 32*c38ced1bSHerbert Dürr include $(CORE_DEPTH)/coreconf/UNIX.mk 33cdf0e10cSrcweir 34*c38ced1bSHerbert Dürr-DEFAULT_COMPILER = gcc 35*c38ced1bSHerbert Dürr+DEFAULT_COMPILER = cc 36*c38ced1bSHerbert Dürr+ 37cdf0e10cSrcweir+# CC is taken from environment automatically. 38cdf0e10cSrcweir+#CC = cc 39cdf0e10cSrcweir+CCC = $(CXX) 40*c38ced1bSHerbert Dürr 41*c38ced1bSHerbert Dürr-CC = gcc 42*c38ced1bSHerbert Dürr-CCC = g++ 43cdf0e10cSrcweir RANLIB = ranlib 44cdf0e10cSrcweir 45cdf0e10cSrcweir ifndef CPU_ARCH 46*c38ced1bSHerbert Dürr--- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100 47*c38ced1bSHerbert Dürr+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200 48*c38ced1bSHerbert Dürr@@ -16,8 +16,11 @@ 49cdf0e10cSrcweir IMPL_STRATEGY = _PTH 50cdf0e10cSrcweir endif 51cdf0e10cSrcweir 52cdf0e10cSrcweir-CC = gcc 53cdf0e10cSrcweir-CCC = g++ 54cdf0e10cSrcweir+# CC is taken from environment automatically. 55cdf0e10cSrcweir+#CC = gcc 56cdf0e10cSrcweir+# Use CCC from environment. 57cdf0e10cSrcweir+#CCC = g++ 58cdf0e10cSrcweir+CCC = $(CXX) 59cdf0e10cSrcweir RANLIB = ranlib 60cdf0e10cSrcweir 61cdf0e10cSrcweir DEFAULT_COMPILER = gcc 62*c38ced1bSHerbert Dürr@@ -143,7 +146,7 @@ 63cdf0e10cSrcweir # incorrectly reports undefined references in the libraries we link with, so 64cdf0e10cSrcweir # we don't use -z defs there. 65cdf0e10cSrcweir ZDEFS_FLAG = -Wl,-z,defs 66cdf0e10cSrcweir-DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) 67cdf0e10cSrcweir+DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN' 68cdf0e10cSrcweir LDFLAGS += $(ARCHFLAG) 69cdf0e10cSrcweir 70*c38ced1bSHerbert Dürr # On Maemo, we need to use the -rpath-link flag for even the standard system 71*c38ced1bSHerbert Dürr@@ -174,8 +177,13 @@ 72*c38ced1bSHerbert Dürr endif 73*c38ced1bSHerbert Dürr endif 74cdf0e10cSrcweir 75cdf0e10cSrcweir+ifeq ($(SYSTEM_ZLIB),YES) 76cdf0e10cSrcweir+# Currently (3.12.4) only the tools modutil and signtool are linked with libz 77cdf0e10cSrcweir+# If USE_SYSTEM_ZLIB is not set then the tools link statically libzlib.a which 78cdf0e10cSrcweir+# is also build in nss. 79cdf0e10cSrcweir USE_SYSTEM_ZLIB = 1 80cdf0e10cSrcweir ZLIB_LIBS = -lz 81cdf0e10cSrcweir+endif 82cdf0e10cSrcweir 83cdf0e10cSrcweir # The -rpath '$$ORIGIN' linker option instructs this library to search for its 84cdf0e10cSrcweir # dependencies in the same directory where it resides. 85*c38ced1bSHerbert Dürr--- misc/nss-3.14.4/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 86*c38ced1bSHerbert Dürr+++ misc/build/nss-3.14.4/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200 87*c38ced1bSHerbert Dürr@@ -48,8 +48,12 @@ 88cdf0e10cSrcweir # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer 89cdf0e10cSrcweir endif 90cdf0e10cSrcweir else 91cdf0e10cSrcweir- CC = cc 92cdf0e10cSrcweir- CCC = CC 93cdf0e10cSrcweir+# CC is taken from environment automatically. 94cdf0e10cSrcweir+# CC = cc 95cdf0e10cSrcweir+# Use CXX from environment. 96cdf0e10cSrcweir+# CCC = CC 97cdf0e10cSrcweir+ CCC = $(CXX) 98cdf0e10cSrcweir+ 99cdf0e10cSrcweir ASFLAGS += -Wa,-P 100cdf0e10cSrcweir OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) 101cdf0e10cSrcweir ifndef BUILD_OPT 102*c38ced1bSHerbert Dürr--- misc/nss-3.14.4/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 103*c38ced1bSHerbert Dürr+++ misc/build/nss-3.14.4/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 104*c38ced1bSHerbert Dürr@@ -302,7 +302,12 @@ 105cdf0e10cSrcweir # IMPL_STRATEGY may be defined too. 106cdf0e10cSrcweir # 107cdf0e10cSrcweir 108cdf0e10cSrcweir-OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ 109cdf0e10cSrcweir+# OBJDIR_NAME is used to build the directory containing the built objects, for 110cdf0e10cSrcweir+# example mozilla/dist/Linux2.6_x86_glibc_PTH_DBG.OBJ 111cdf0e10cSrcweir+# We need to deliver the contents of that folder into the solver. To make that easier 112cdf0e10cSrcweir+# in the makefile we rename this directory to "out". 113cdf0e10cSrcweir+#OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ 114cdf0e10cSrcweir+OBJDIR_NAME = out 115cdf0e10cSrcweir 116cdf0e10cSrcweir ifeq (,$(filter-out WIN%,$(OS_TARGET))) 117cdf0e10cSrcweir ifndef BUILD_OPT 118*c38ced1bSHerbert Dürr--- misc/nss-3.14.4/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100 119*c38ced1bSHerbert Dürr+++ misc/build/nss-3.14.4/mozilla/security/coreconf/rules.mk 2010-06-11 16:35:54.996448704 +0200 120*c38ced1bSHerbert Dürr@@ -318,7 +318,12 @@ 121cdf0e10cSrcweir ifdef NS_USE_GCC 122cdf0e10cSrcweir $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< 123cdf0e10cSrcweir else 124cdf0e10cSrcweir- $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $< 125cdf0e10cSrcweir+ #We remove stl from the paths to avoid that rc.exe finds the stlport of 126cdf0e10cSrcweir+ #OOo. stlport includes the system stl which will fail. By removing it, 127cdf0e10cSrcweir+ #rc will use the stl from the system if the path is in the INCLUDE 128cdf0e10cSrcweir+ #variable. 129cdf0e10cSrcweir+ INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $< 130cdf0e10cSrcweir+ 131cdf0e10cSrcweir endif 132cdf0e10cSrcweir @echo $(RES) finished 133cdf0e10cSrcweir endif 134*c38ced1bSHerbert Dürr--- misc/nss-3.14.4/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 135*c38ced1bSHerbert Dürr+++ misc/build/nss-3.14.4/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 136*c38ced1bSHerbert Dürr@@ -10,17 +10,18 @@ 137*c38ced1bSHerbert Dürr 138cdf0e10cSrcweir ifeq ($(OS_ARCH), SunOS) 139cdf0e10cSrcweir ifeq ($(USE_64), 1) 140cdf0e10cSrcweir-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64' 141*c38ced1bSHerbert Dürr+#In AOO we would probable put the executables next to libs 142cdf0e10cSrcweir+EXTRA_SHARED_LIBS += -R '$$ORIGIN' 143cdf0e10cSrcweir else 144cdf0e10cSrcweir-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps' 145cdf0e10cSrcweir+EXTRA_SHARED_LIBS += -R '$$ORIGIN' 146cdf0e10cSrcweir endif 147cdf0e10cSrcweir endif 148cdf0e10cSrcweir 149cdf0e10cSrcweir ifeq ($(OS_ARCH), Linux) 150cdf0e10cSrcweir ifeq ($(USE_64), 1) 151cdf0e10cSrcweir-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' 152cdf0e10cSrcweir+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' 153cdf0e10cSrcweir else 154cdf0e10cSrcweir-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' 155cdf0e10cSrcweir+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' 156cdf0e10cSrcweir endif 157cdf0e10cSrcweir endif 158*c38ced1bSHerbert Dürr 159*c38ced1bSHerbert Dürr--- misc/nss-3.14.4/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 160*c38ced1bSHerbert Dürr+++ misc/build/nss-3.14.4/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200 161*c38ced1bSHerbert Dürr@@ -46,10 +46,15 @@ 162cdf0e10cSrcweir 163cdf0e10cSrcweir # sign any and all shared libraries that contain the word freebl 164cdf0e10cSrcweir 165cdf0e10cSrcweir-CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) 166cdf0e10cSrcweir-CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) 167cdf0e10cSrcweir+# Signing causes loading of some system library which in turn loads 168cdf0e10cSrcweir+# libsqlite3. Then it loads libsqulite3 from nss, which does not have the proper 169cdf0e10cSrcweir+# version. Therefore signing fails. 170cdf0e10cSrcweir+# We cannot build with the system sqlite3, because it is too old (SDK 171cdf0e10cSrcweir+# 10.4). Otherwise one could set NSS_USE_SYSTEM_SQLITE=1 and use the system lib. 172cdf0e10cSrcweir+#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) 173cdf0e10cSrcweir+#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) 174cdf0e10cSrcweir ifndef NSS_DISABLE_DBM 175cdf0e10cSrcweir-CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) 176cdf0e10cSrcweir+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) 177cdf0e10cSrcweir endif 178cdf0e10cSrcweir CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) 179cdf0e10cSrcweir 180