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

[wahwah at users.sourceforge.net]

Revision: 7373
          http://gar.svn.sourceforge.net/gar/?rev=7373&view=rev
Author:   wahwah
Date:     2009-11-21 16:40:28 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
nss: adding a patch to find the sqlite3 library, using with-nspr-4.8 version of NSS

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

Added Paths:
-----------
    csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2009-11-21 15:16:44 UTC (rev 7372)
+++ csw/mgar/pkg/nss/trunk/Makefile	2009-11-21 16:40:28 UTC (rev 7373)
@@ -43,7 +43,8 @@
 ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR).
 # TODO: Generate RTM_NAME from GARVERSION
 RTM_NAME = NSS_3_12_4_RTM
-MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/
+# MASTER_SITES = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/
+MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/
 ##
 ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
 ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge
@@ -56,12 +57,15 @@
 # http://bugs.gentoo.org/show_bug.cgi?id=256102
 PATCHFILES  = nss-3.12.4.patch
 PATCHFILES += shared-libs.patch
+PATCHFILES += platlibs-sqlite3.patch
 ## PATCHFILES = freebl.patch
 ##
 ## Whitespace-separated list of files which comprise this build. mGAR will look
 ## for the files in the $(FILEDIR) (trunk/files) directory and on the
 ## $(MASTER_SITES).
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+# DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES  = $(GARNAME)-$(GARVERSION)-with-nspr-4.8.tar.gz
+DISTNAME = $(GARNAME)-$(GARVERSION)-with-nspr-4.8
 ##
 ## We define upstream file regex so we can be notifed of new upstream software
 ## release

Modified: csw/mgar/pkg/nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/nss/trunk/checksums	2009-11-21 15:16:44 UTC (rev 7372)
+++ csw/mgar/pkg/nss/trunk/checksums	2009-11-21 16:40:28 UTC (rev 7373)
@@ -1,3 +1,4 @@
+8f76e381bf2339d731bfd5b8116c25a4  nss-3.12.4-with-nspr-4.8.tar.gz
 39b9d2431d4ff717d103b742fcaefb81  nss-3.12.4.patch
-1ee3ed9c1900079319bd1de51388d856  nss-3.12.4.tar.gz
-0b7f69f1fdd6fbeddd9c216f59ecabc6  shared-libs.patch
+f0f40bd021423ab1680b4d87cd19c1db  platlibs-sqlite3.patch
+971cfae38e3070d64dccb0960e5deae0  shared-libs.patch

Added: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch	                        (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch	2009-11-21 16:40:28 UTC (rev 7373)
@@ -0,0 +1,11 @@
+--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig	2009-11-21 17:28:09.997982796 +0100
++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk	2009-11-21 17:28:32.107632453 +0100
+@@ -80,7 +80,7 @@
+ endif
+ endif
+ 
+-SQLITE=-lsqlite3
++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3
+ 
+ ifdef NSS_DISABLE_DBM
+ DBMLIB = $(NULL)

Modified: csw/mgar/pkg/nss/trunk/files/shared-libs.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/shared-libs.patch	2009-11-21 15:16:44 UTC (rev 7372)
+++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch	2009-11-21 16:40:28 UTC (rev 7373)
@@ -1,18 +1,18 @@
---- nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk	2009-11-21 15:53:39.167529521 +0100
-+++ nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk.orig	2009-11-21 15:52:38.972288644 +0100
-@@ -54,7 +54,6 @@
+--- 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 @@
  
  ifdef NS_USE_GCC
  EXTRA_SHARED_LIBS += \
--	-L/opt/csw/lib \
++	-L/opt/csw/lib \
  	-L$(DIST)/lib \
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
-@@ -81,7 +80,6 @@
+@@ -80,6 +81,7 @@
  # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
  # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
  EXTRA_SHARED_LIBS += \
--	-L/opt/csw/lib \
++	-L/opt/csw/lib \
  	-L$(DIST)/lib \
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \


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