Mercurial Mercurial > sustaining > oi_151a > oi-build / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup mozilla-nss building and runtime linking oi_151a
authorJon Tibble <meths@btinternet.com>
Thu, 02 Feb 2012 15:45:47 +0000
branchoi_151a
changeset 260 33f48018b76f
parent 259 becada687c9c
child 261 3899ac81760b
Cleanup mozilla-nss building and runtime linking
components/sic_team/mozilla-nss/patches/arch.patch file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/patches/runpath.patch file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/patches/runpath2.patch file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sic_team/mozilla-nss/patches/arch.patch	Thu Feb 02 15:45:47 2012 +0000
@@ -0,0 +1,20 @@
+--- nss-3.12.6/mozilla/security/coreconf/SunOS5.mk.orig	2012-02-02 14:46:03.520995829 +0000
++++ nss-3.12.6/mozilla/security/coreconf/SunOS5.mk	2012-02-02 14:46:43.710652404 +0000
+@@ -56,7 +56,7 @@
+       ARCHFLAG=-m64
+   else
+       ifeq ($(OS_TEST),i86pc)
+-        ARCHFLAG=-xarch=amd64
++        ARCHFLAG=-m64
+       else
+         ARCHFLAG=-xarch=v9
+       endif
+@@ -147,7 +147,7 @@
+ else
+ ifeq ($(USE_64), 1)
+ 	ifeq ($(OS_TEST),i86pc)
+-	    DSO_LDOPTS +=-xarch=amd64
++	    DSO_LDOPTS +=-m64
+ 	else
+ 	    DSO_LDOPTS +=-xarch=v9
+ 	endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sic_team/mozilla-nss/patches/runpath.patch	Thu Feb 02 15:45:47 2012 +0000
@@ -0,0 +1,24 @@
+diff -ur nss-3.12.6.orig/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure nss-3.12.6/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure
+--- nss-3.12.6.orig/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure	2000-05-09 00:19:44.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure	2012-02-02 13:56:33.870847158 +0000
+@@ -583,7 +583,7 @@
+ 
+ 
+ NSPR_CFLAGS="-I$NSPR_INCLUDE"
+-NSPR_LDFLAGS="-L$NSPR_LIBPATH -lnspr4 -lplc4 -lplds4"
++NSPR_LDFLAGS="-L$NSPR_LIBPATH -R$NSPR_LIBPATH -lnspr4 -lplc4 -lplds4"
+ 
+ 
+ # Check whether --with-nss-dist or --without-nss-dist was given.
+diff -ur nss-3.12.6.orig/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure.in nss-3.12.6/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure.in
+--- nss-3.12.6.orig/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure.in	2006-03-02 22:48:55.000000000 +0000
++++ nss-3.12.6/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure.in	2012-02-02 13:57:06.895561687 +0000
+@@ -60,7 +60,7 @@
+ )
+ 
+ NSPR_CFLAGS="-I$NSPR_INCLUDE"
+-NSPR_LDFLAGS="-L$NSPR_LIBPATH -lnspr4 -lplc4 -lplds4"
++NSPR_LDFLAGS="-L$NSPR_LIBPATH -R$NSPR_LIBPATH -lnspr4 -lplc4 -lplds4"
+ 
+ dnl This isn't optimum, but the mozilla build system and autoconf don't really mesh well..
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sic_team/mozilla-nss/patches/runpath2.patch	Thu Feb 02 15:45:47 2012 +0000
@@ -0,0 +1,173 @@
+diff -ur nss-3.12.6.orig/mozilla/security/nss/cmd/pk11mode/Makefile nss-3.12.6/mozilla/security/nss/cmd/pk11mode/Makefile
+--- nss-3.12.6.orig/mozilla/security/nss/cmd/pk11mode/Makefile	2009-03-31 00:40:52.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/cmd/pk11mode/Makefile	2012-02-02 14:38:31.494513429 +0000
+@@ -70,6 +70,7 @@
+ 
+ EXTRA_SHARED_LIBS += \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk
+--- nss-3.12.6.orig/mozilla/security/nss/cmd/platlibs.mk	2010-02-04 18:59:10.000000000 +0000
++++ nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk	2012-02-02 14:36:02.417536468 +0000
+@@ -183,6 +183,7 @@
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+@@ -235,6 +236,7 @@
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/Makefile nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile
+--- nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/Makefile	2009-08-07 20:06:37.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile	2012-02-02 14:38:02.243374759 +0000
+@@ -68,6 +68,7 @@
+ 
+ EXTRA_SHARED_LIBS += \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/mangle/Makefile nss-3.12.6/mozilla/security/nss/cmd/shlibsign/mangle/Makefile
+--- nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2008-11-20 15:44:24.000000000 +0000
++++ nss-3.12.6/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2012-02-02 14:36:31.841732437 +0000
+@@ -68,6 +68,7 @@
+ 
+ EXTRA_SHARED_LIBS += \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/builtins/Makefile nss-3.12.6/mozilla/security/nss/lib/ckfw/builtins/Makefile
+--- nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/builtins/Makefile	2009-12-17 22:00:47.000000000 +0000
++++ nss-3.12.6/mozilla/security/nss/lib/ckfw/builtins/Makefile	2012-02-02 14:28:57.559752851 +0000
+@@ -66,6 +66,7 @@
+ 
+ EXTRA_SHARED_LIBS += \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/capi/Makefile nss-3.12.6/mozilla/security/nss/lib/ckfw/capi/Makefile
+--- nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/capi/Makefile	2009-07-29 21:15:19.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/lib/ckfw/capi/Makefile	2012-02-02 14:27:59.590451326 +0000
+@@ -72,6 +72,7 @@
+ 
+ EXTRA_LIBS += \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/nssmkey/Makefile nss-3.12.6/mozilla/security/nss/lib/ckfw/nssmkey/Makefile
+--- nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/nssmkey/Makefile	2005-11-23 23:04:08.000000000 +0000
++++ nss-3.12.6/mozilla/security/nss/lib/ckfw/nssmkey/Makefile	2012-02-02 14:28:33.862666008 +0000
+@@ -67,6 +67,7 @@
+ 
+ EXTRA_LIBS += \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/freebl/config.mk nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk
+--- nss-3.12.6.orig/mozilla/security/nss/lib/freebl/config.mk	2009-04-11 22:18:42.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk	2012-02-02 14:33:24.476440608 +0000
+@@ -111,6 +111,7 @@
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lnspr4 \
+ 	$(NULL)
+ else
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/nss/config.mk nss-3.12.6/mozilla/security/nss/lib/nss/config.mk
+--- nss-3.12.6.orig/mozilla/security/nss/lib/nss/config.mk	2009-12-15 22:22:31.000000000 +0000
++++ nss-3.12.6/mozilla/security/nss/lib/nss/config.mk	2012-02-02 14:32:23.596086591 +0000
+@@ -73,6 +73,7 @@
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/smime/config.mk nss-3.12.6/mozilla/security/nss/lib/smime/config.mk
+--- nss-3.12.6.orig/mozilla/security/nss/lib/smime/config.mk	2009-06-11 01:55:47.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/lib/smime/config.mk	2012-02-02 14:32:04.860999052 +0000
+@@ -75,6 +75,7 @@
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/softoken/config.mk nss-3.12.6/mozilla/security/nss/lib/softoken/config.mk
+--- nss-3.12.6.orig/mozilla/security/nss/lib/softoken/config.mk	2009-06-11 01:55:48.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/lib/softoken/config.mk	2012-02-02 14:32:52.701287385 +0000
+@@ -85,6 +85,7 @@
+ 	-lnssutil3 \
+ 	-lsqlite3 \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.12.6/mozilla/security/nss/lib/softoken/legacydb/config.mk
+--- nss-3.12.6.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk	2009-06-11 01:55:49.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/lib/softoken/legacydb/config.mk	2012-02-02 14:33:09.164394761 +0000
+@@ -83,6 +83,7 @@
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/ssl/config.mk nss-3.12.6/mozilla/security/nss/lib/ssl/config.mk
+--- nss-3.12.6.orig/mozilla/security/nss/lib/ssl/config.mk	2010-02-04 19:09:08.000000000 +0000
++++ nss-3.12.6/mozilla/security/nss/lib/ssl/config.mk	2012-02-02 14:33:35.117601311 +0000
+@@ -88,6 +88,7 @@
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/sysinit/config.mk nss-3.12.6/mozilla/security/nss/lib/sysinit/config.mk
+--- nss-3.12.6.orig/mozilla/security/nss/lib/sysinit/config.mk	2010-02-16 19:38:42.000000000 +0000
++++ nss-3.12.6/mozilla/security/nss/lib/sysinit/config.mk	2012-02-02 14:29:31.994941326 +0000
+@@ -78,6 +78,7 @@
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/util/config.mk nss-3.12.6/mozilla/security/nss/lib/util/config.mk
+--- nss-3.12.6.orig/mozilla/security/nss/lib/util/config.mk	2009-12-15 22:22:31.000000000 +0000
++++ nss-3.12.6/mozilla/security/nss/lib/util/config.mk	2012-02-02 14:32:38.525180567 +0000
+@@ -68,6 +68,7 @@
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib \
+ 	-L$(NSPR_LIB_DIR) \
++	-R$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
sustaining/oi_151a/oi-build