diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2009-04-15 15:33:49 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2009-04-15 15:33:49 +0000 |
| commit | 56e1faa986fb7dc77bf991b161131a8294a62087 (patch) | |
| tree | 25c9c4e1d45cfdec7b342660034cabe9752721b8 /dev-libs/nss | |
| parent | Marking vuze-4.1.0.4 ppc64 for bug 266113 (diff) | |
| download | gentoo-2-56e1faa986fb7dc77bf991b161131a8294a62087.tar.gz gentoo-2-56e1faa986fb7dc77bf991b161131a8294a62087.tar.bz2 gentoo-2-56e1faa986fb7dc77bf991b161131a8294a62087.zip | |
Add missing patch
(Portage version: 2.1.6.7/cvs/Linux ia64)
Diffstat (limited to 'dev-libs/nss')
| -rw-r--r-- | dev-libs/nss/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/nss/files/nss-3.12-config.patch | 104 |
2 files changed, 109 insertions, 1 deletions
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index f9dfdffb9280..19e4d7d43cab 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nss # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.143 2009/04/15 13:37:52 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.144 2009/04/15 15:33:49 armin76 Exp $ + + 15 Apr 2009; Raúl Porcel <armin76@gentoo.org> + +files/nss-3.12-config.patch: + Add missing patch *nss-3.12.3 (15 Apr 2009) diff --git a/dev-libs/nss/files/nss-3.12-config.patch b/dev-libs/nss/files/nss-3.12-config.patch new file mode 100644 index 000000000000..085648e11039 --- /dev/null +++ b/dev-libs/nss/files/nss-3.12-config.patch @@ -0,0 +1,104 @@ +diff -ur mozilla.orig/security/nss/lib/ckfw/builtins/config.mk mozilla/security/nss/lib/ckfw/builtins/config.mk +--- mozilla.orig/security/nss/lib/ckfw/builtins/config.mk 2009-04-15 15:29:14.000000000 +0000 ++++ mozilla/security/nss/lib/ckfw/builtins/config.mk 2009-04-15 15:31:02.000000000 +0000 +@@ -79,3 +79,10 @@ + endif + endif + endif ++ ++ifeq ($(OS_TARGET),Linux) ++# The -R '$ORIGIN' linker option instructs this library to search for its ++# dependencies in the same directory where it resides. ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif ++ +Only in mozilla/security/nss/lib/ckfw/builtins: config.mk.orig +Only in mozilla/security/nss/lib/ckfw/builtins: config.mk.rej +diff -ur mozilla.orig/security/nss/lib/ckfw/capi/config.mk mozilla/security/nss/lib/ckfw/capi/config.mk +--- mozilla.orig/security/nss/lib/ckfw/capi/config.mk 2009-04-15 15:29:14.000000000 +0000 ++++ mozilla/security/nss/lib/ckfw/capi/config.mk 2009-04-15 15:29:42.000000000 +0000 +@@ -71,3 +71,9 @@ + MKSHLIB += -R '$$ORIGIN' + endif + ++ifeq ($(OS_TARGET),Linux) ++# The -R '$ORIGIN' linker option instructs this library to search for its ++# dependencies in the same directory where it resides. ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif ++ +Only in mozilla/security/nss/lib/ckfw/capi: config.mk.orig +diff -ur mozilla.orig/security/nss/lib/freebl/Makefile mozilla/security/nss/lib/freebl/Makefile +--- mozilla.orig/security/nss/lib/freebl/Makefile 2009-04-15 15:29:14.000000000 +0000 ++++ mozilla/security/nss/lib/freebl/Makefile 2009-04-15 15:29:42.000000000 +0000 +@@ -143,6 +143,7 @@ + endif + + ifeq ($(OS_TARGET),Linux) ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' + ifeq ($(CPU_ARCH),x86_64) + ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s + ASFLAGS += -march=opteron -m64 -fPIC +Only in mozilla/security/nss/lib/freebl: Makefile.orig +diff -ur mozilla.orig/security/nss/lib/nss/config.mk mozilla/security/nss/lib/nss/config.mk +--- mozilla.orig/security/nss/lib/nss/config.mk 2009-04-15 15:29:14.000000000 +0000 ++++ mozilla/security/nss/lib/nss/config.mk 2009-04-15 15:29:42.000000000 +0000 +@@ -83,6 +83,11 @@ + + endif + ++ifeq ($(OS_TARGET),Linux) ++# The -R '$ORIGIN' linker option instructs this library to search for its ++# dependencies in the same directory where it resides. ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif + + # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS) + SHARED_LIBRARY_LIBS = \ +Only in mozilla/security/nss/lib/nss: config.mk.orig +diff -ur mozilla.orig/security/nss/lib/smime/config.mk mozilla/security/nss/lib/smime/config.mk +--- mozilla.orig/security/nss/lib/smime/config.mk 2009-04-15 15:29:14.000000000 +0000 ++++ mozilla/security/nss/lib/smime/config.mk 2009-04-15 15:31:30.000000000 +0000 +@@ -106,3 +106,8 @@ + endif + endif + ++ifeq ($(OS_TARGET),Linux) ++# The -R '$ORIGIN' linker option instructs this library to search for its ++# dependencies in the same directory where it resides. ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif +Only in mozilla/security/nss/lib/smime: config.mk.orig +Only in mozilla/security/nss/lib/smime: config.mk.rej +diff -ur mozilla.orig/security/nss/lib/softoken/config.mk mozilla/security/nss/lib/softoken/config.mk +--- mozilla.orig/security/nss/lib/softoken/config.mk 2009-04-15 15:29:14.000000000 +0000 ++++ mozilla/security/nss/lib/softoken/config.mk 2009-04-15 15:29:42.000000000 +0000 +@@ -114,6 +114,12 @@ + endif + endif + ++ifeq ($(OS_TARGET),Linux) ++# The -R '$ORIGIN' linker option instructs this library to search for its ++# dependencies in the same directory where it resides. ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif ++ + ifeq ($(OS_TARGET),WINCE) + DEFINES += -DDBM_USING_NSPR + endif +Only in mozilla/security/nss/lib/softoken: config.mk.orig +diff -ur mozilla.orig/security/nss/lib/ssl/config.mk mozilla/security/nss/lib/ssl/config.mk +--- mozilla.orig/security/nss/lib/ssl/config.mk 2009-04-15 15:29:14.000000000 +0000 ++++ mozilla/security/nss/lib/ssl/config.mk 2009-04-15 15:29:42.000000000 +0000 +@@ -130,4 +130,10 @@ + endif + endif + ++ifeq ($(OS_TARGET),Linux) ++# The -R '$ORIGIN' linker option instructs this library to search for its ++# dependencies in the same directory where it resides. ++DSO_LDOPTS += -Wl,-R,'$$ORIGIN' ++endif ++ + endif +Only in mozilla/security/nss/lib/ssl: config.mk.orig |