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

[wahwah at users.sourceforge.net]

Revision: 7377
          http://gar.svn.sourceforge.net/gar/?rev=7377&view=rev
Author:   wahwah
Date:     2009-11-21 20:22:58 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
nss: Added the runtime search path option to the shared libs patch. Now, instead of segfaulting, it aborts.

Modified Paths:
--------------
    csw/mgar/pkg/nss/trunk/Makefile
    csw/mgar/pkg/nss/trunk/checksums
    csw/mgar/pkg/nss/trunk/files/shared-libs.patch

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2009-11-21 19:57:53 UTC (rev 7376)
+++ csw/mgar/pkg/nss/trunk/Makefile	2009-11-21 20:22:58 UTC (rev 7377)
@@ -190,9 +190,6 @@
 ##
 
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-## # To fix PR_STATIC_ASSERT(sizeof(size_t) > 4); in drbg.c, line 510
-## EXTRA_CFLAGS = -DNS_PTR_GT_32=1
-## EXTRA_CXXFLAGS = -DNS_PTR_GT_32=1
 BUILD_OPT = 1
 NSS_USE_SYSTEM_SQLITE = 1
 NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//')
@@ -207,11 +204,13 @@
 # export DSO_LDOPTS
 ifeq ($(MODULATION),isa-sparcv9)
 	USE_64 = 1
+	export USE_64
 endif
 ifeq ($(MODULATION),isa-amd64)
 	USE_64 = 1
+	export USE_64
 endif
-export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR USE_64
+export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR
 export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS FREEBL_NO_DEPEND
 
 include gar/category.mk

Modified: csw/mgar/pkg/nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/nss/trunk/checksums	2009-11-21 19:57:53 UTC (rev 7376)
+++ csw/mgar/pkg/nss/trunk/checksums	2009-11-21 20:22:58 UTC (rev 7377)
@@ -1,4 +1,4 @@
 8f76e381bf2339d731bfd5b8116c25a4  nss-3.12.4-with-nspr-4.8.tar.gz
 39b9d2431d4ff717d103b742fcaefb81  nss-3.12.4.patch
 f0f40bd021423ab1680b4d87cd19c1db  platlibs-sqlite3.patch
-971cfae38e3070d64dccb0960e5deae0  shared-libs.patch
+31aeaf6718c269812c445fb3e86f6ac6  shared-libs.patch

Modified: csw/mgar/pkg/nss/trunk/files/shared-libs.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/shared-libs.patch	2009-11-21 19:57:53 UTC (rev 7376)
+++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch	2009-11-21 20:22:58 UTC (rev 7377)
@@ -1,17 +1,19 @@
---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig	2009-11-21 16:42:33.499624641 +0100
-+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk	2009-11-21 16:43:06.838729533 +0100
-@@ -54,6 +54,7 @@
+--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig	2009-11-21 21:00:43.881431583 +0100
++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk	2009-11-21 21:01:18.985608134 +0100
+@@ -54,6 +54,8 @@
  
  ifdef NS_USE_GCC
  EXTRA_SHARED_LIBS += \
++	-R/opt/csw/lib/$$ISALIST \
 +	-L/opt/csw/lib \
  	-L$(DIST)/lib \
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
-@@ -80,6 +81,7 @@
+@@ -80,6 +82,8 @@
  # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
  # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
  EXTRA_SHARED_LIBS += \
++	-R/opt/csw/lib/$$ISALIST \
 +	-L/opt/csw/lib \
  	-L$(DIST)/lib \
  	-L$(NSSUTIL_LIB_DIR) \


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