diff --git a/dev-libs/nss/files/nss-3.11-config.patch b/dev-libs/nss/files/nss-3.11-config.patch deleted file mode 100644 --- a/dev-libs/nss/files/nss-3.11-config.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- mozilla/security/nss/lib/ckfw/builtins/config.mk.orig 2005-01-20 02:25:46.000000000 +0000 -+++ mozilla/security/nss/lib/ckfw/builtins/config.mk 2006-01-15 05:13:08.000000000 +0000 -@@ -69,3 +69,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 -+ ---- mozilla/security/nss/lib/ckfw/capi/config.mk.orig 2005-11-04 02:05:04.000000000 +0000 -+++ mozilla/security/nss/lib/ckfw/capi/config.mk 2006-01-15 05:13:52.000000000 +0000 -@@ -69,3 +69,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 -+ ---- mozilla/security/nss/lib/freebl/Makefile.orig 2005-11-22 07:13:32.000000000 +0000 -+++ mozilla/security/nss/lib/freebl/Makefile 2006-01-15 05:16:05.000000000 +0000 -@@ -132,6 +132,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 ---- mozilla/security/nss/lib/nss/config.mk.orig 2005-07-21 23:48:28.000000000 +0000 -+++ mozilla/security/nss/lib/nss/config.mk 2006-01-15 05:11:58.000000000 +0000 -@@ -122,6 +122,11 @@ - 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 (,$(filter-out WINNT WIN95,$(OS_TARGET))) - ifndef NS_USE_GCC ---- mozilla/security/nss/lib/smime/config.mk.orig 2005-09-02 01:24:57.000000000 +0000 -+++ mozilla/security/nss/lib/smime/config.mk 2006-01-15 05:05:53.000000000 +0000 -@@ -97,3 +97,10 @@ - # dependencies in the same directory where it resides. - 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 -+ ---- mozilla/security/nss/lib/softoken/config.mk.orig 2005-10-19 01:03:31.000000000 +0000 -+++ mozilla/security/nss/lib/softoken/config.mk 2006-01-15 05:07:15.000000000 +0000 -@@ -93,6 +93,12 @@ - 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 -+ - ifeq ($(OS_TARGET),WINCE) - DEFINES += -DDBM_USING_NSPR - endif ---- mozilla/security/nss/lib/ssl/config.mk.orig 2005-10-19 01:04:16.000000000 +0000 -+++ mozilla/security/nss/lib/ssl/config.mk 2006-01-15 05:10:38.000000000 +0000 -@@ -119,6 +119,12 @@ - #EXTRA_SHARED_LIBS += -ldl -lrt -lc -z defs - 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 - - # indicates dependency on freebl static lib