494107 update rpath ORIGIN for solaris and linux r=julien

security/nss/cmd/platlibs.mk

@@ -51,6 +51,13 @@ endif
 endif
 
 ifeq ($(OS_ARCH), Linux)
+ifeq ($(BUILD_SUN_PKG), 1)
+ifeq ($(USE_64), 1)
+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
+else
+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
+endif
+endif
 ifeq ($(USE_64), 1)
 EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
 else

security/nss/lib/nss/config.mk

@@ -143,6 +143,20 @@ MKSHLIB += -R '$$ORIGIN'
 endif
 endif
 
+ifeq ($(OS_TARGET),Linux)
+# The -rpath '$$ORIGIN' linker option instructs this library to search for its
+# dependencies in the same directory where it resides.
+ifeq ($(BUILD_SUN_PKG), 1)
+ifeq ($(USE_64), 1)
+MKSHLIB += -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib64:/opt/sun/private/lib'
+else
+MKSHLIB += -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib'
+endif
+else
+MKSHLIB += -Wl,-rpath,'$$ORIGIN'
+endif
+endif
+
 ifeq ($(OS_ARCH), HP-UX) 
 ifneq ($(OS_TEST), ia64)
 # pa-risc

security/nss/lib/softoken/config.mk

@@ -96,12 +96,34 @@ OS_LIBS += -lpthread
 endif
 
 ifeq ($(OS_TARGET),SunOS)
+ifeq ($(BUILD_SUN_PKG), 1)
 # The -R '$ORIGIN' linker option instructs this library to search for its
 # dependencies in the same directory where it resides.
+ifeq ($(USE_64), 1)
+MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
+else
+MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
+endif
+else
 MKSHLIB += -R '$$ORIGIN'
+endif
 OS_LIBS += -lbsm 
 endif
 
+ifeq ($(OS_TARGET),Linux)
+# The -rpath '$$ORIGIN' linker option instructs this library to search for its
+# dependencies in the same directory where it resides.
+ifeq ($(BUILD_SUN_PKG), 1)
+ifeq ($(USE_64), 1)
+MKSHLIB += -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib64:/opt/sun/private/lib'
+else
+MKSHLIB += -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib'
+endif
+else
+MKSHLIB += -Wl,-rpath,'$$ORIGIN'
+endif
+endif
+
 ifeq ($(OS_ARCH), HP-UX) 
 ifneq ($(OS_TEST), ia64)
 # pa-risc