[csw-devel] SF.net SVN: gar:[20148] csw/mgar/pkg/nss/trunk

[cgrzemba at users.sourceforge.net]

Revision: 20148
          http://gar.svn.sourceforge.net/gar/?rev=20148&view=rev
Author:   cgrzemba
Date:     2013-01-16 13:00:42 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
nss/trunk: fixing rpath problem

Modified Paths:
--------------
    csw/mgar/pkg/nss/trunk/Makefile
    csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch
    csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2013-01-16 11:18:07 UTC (rev 20147)
+++ csw/mgar/pkg/nss/trunk/Makefile	2013-01-16 13:00:42 UTC (rev 20148)
@@ -236,13 +236,13 @@
 endif
 export NSPR_LIB_DIR
 
-LD_OPTIONS = -z ignore -Bdirect
+# LD_OPTIONS = -z ignore -Bdirect
 ifeq ($(USE_64),1) 
   SQLITE_LIB_DIR = /opt/csw/lib/64
-  LD_OPTIONS += -R/opt/csw/lib/64/$$$$ISALIST
+#   LD_OPTIONS += -R/opt/csw/lib/64/\$$ISALIST
 else
   SQLITE_LIB_DIR = /opt/csw/lib
-  LD_OPTIONS += -R/opt/csw/lib/$$$$ISALIST
+#   LD_OPTIONS += -R/opt/csw/lib/\$$ISALIST
 endif
 export SQLITE_LIB_DIR
 
@@ -300,9 +300,10 @@
 # There's an extra interpolation somehwere inside nss' build system, so $$$$
 # needs to be used instead of $$.
 build-nss-compile:
+	@echo $(LD_OPTIONS)
 	(cd $(WORKSRC)/mozilla/security/nss \
-		&& \
-	gmake -j1 LD_OPTIONS='$(LD_OPTIONS)' BUILD_SUN_PKG=1)
+		&& env \
+	gmake -j1 BUILD_SUN_PKG=1)
 	@$(MAKECOOKIE)
 
 install-nss:

Modified: csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch	2013-01-16 11:18:07 UTC (rev 20147)
+++ csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch	2013-01-16 13:00:42 UTC (rev 20148)
@@ -1,19 +1,14 @@
 --- a/mozilla/security/coreconf/SunOS5.mk
 +++ b/mozilla/security/coreconf/SunOS5.mk
-@@ -125,15 +125,6 @@ endif
- 
- NOSUCHFILE   = /solaris-rm-f-sucks
- 
--ifeq ($(BUILD_SUN_PKG), 1)
+@@ -129,9 +129,9 @@ 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)
+ ifeq ($(USE_64), 1)
 -RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
--else
++RPATH = -R'/opt/csw/lib/64/$$ISALIST' -M ${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z ignore
+ else
 -RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
--endif
--else
--RPATH = -R '$$ORIGIN'
-+RPATH = $(LD_OPTIONS)
--endif
--
++RPATH = -R'/opt/csw/lib/$$ISALIST' -M ${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z ignore
+ endif
+ else
+ RPATH = -R '$$ORIGIN'

Modified: csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch	2013-01-16 11:18:07 UTC (rev 20147)
+++ csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch	2013-01-16 13:00:42 UTC (rev 20148)
@@ -5,10 +5,10 @@
  ifeq ($(OS_ARCH), SunOS) 
  ifeq ($(USE_64), 1)
 -EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
-+EXTRA_SHARED_LIBS += -Bdirect -R '/opt/csw/lib/64/$$ISALIST'
++EXTRA_SHARED_LIBS += -R'/opt/csw/lib/64/$$ISALIST' -M ${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z ignore
  else
 -EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
-+EXTRA_SHARED_LIBS += $(LD_OPTIONS)
++EXTRA_SHARED_LIBS += -R'/opt/csw/lib/$$ISALIST' -M ${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z ignore
  endif
  endif
  

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.