2008-03-26 16:24:30 +01:00
|
|
|
Index: security/nss/cmd/platlibs.mk
|
|
|
|
===================================================================
|
|
|
|
RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
|
2012-10-25 16:10:44 +02:00
|
|
|
retrieving revision 1.71
|
|
|
|
diff -u -p -6 -r1.71 platlibs.mk
|
|
|
|
--- security/nss/cmd/platlibs.mk 17 Jul 2012 15:22:42 -0000 1.71
|
2013-06-11 17:41:13 +02:00
|
|
|
+++ nss/cmd/platlibs.mk 25 Oct 2012 12:07:35 -0000
|
2012-10-25 16:10:44 +02:00
|
|
|
@@ -15,15 +15,15 @@ else
|
|
|
|
EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2008-03-26 16:24:30 +01:00
|
|
|
ifeq ($(OS_ARCH), Linux)
|
|
|
|
ifeq ($(USE_64), 1)
|
2009-08-06 18:07:11 +02:00
|
|
|
-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
|
|
|
|
+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
|
2008-03-26 16:24:30 +01:00
|
|
|
else
|
2009-08-06 18:07:11 +02:00
|
|
|
-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
|
|
|
|
+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
|
2008-03-26 16:24:30 +01:00
|
|
|
endif
|
2012-10-25 16:10:44 +02:00
|
|
|
endif
|
|
|
|
|
|
|
|
endif # BUILD_SUN_PKG
|
|
|
|
|
|
|
|
ifdef NSS_DISABLE_DBM
|