[csw-devel] SF.net SVN: gar:[7480] csw/mgar/pkg/nss/branches/upstream-work
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Fri Nov 27 15:26:44 CET 2009
Revision: 7480
http://gar.svn.sourceforge.net/gar/?rev=7480&view=rev
Author: wahwah
Date: 2009-11-27 14:26:44 +0000 (Fri, 27 Nov 2009)
Log Message:
-----------
nss: Added patches to make it use system sqlite3 and compile
Modified Paths:
--------------
csw/mgar/pkg/nss/branches/upstream-work/Makefile
csw/mgar/pkg/nss/branches/upstream-work/checksums
Added Paths:
-----------
csw/mgar/pkg/nss/branches/upstream-work/files/include.patch
csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch
csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch
csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch
csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch
csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch
Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-27 13:48:44 UTC (rev 7479)
+++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-27 14:26:44 UTC (rev 7480)
@@ -14,6 +14,21 @@
# TODO: nss-config
# TODO: a better nss.pc
+# For DBG builds
+PATCHFILES = whoami.patch
+# I'll let Wan-Teh decide what and where to patch
+PATCHFILES += include.patch
+PATCHFILES += ld-options.patch
+PATCHFILES += platlibs-sqlite3.patch
+PATCHFILES_isa-sparcv8 = sqlite3-32.patch
+PATCHFILES_isa-i386 = sqlite3-32.patch
+PATCHFILES_isa-sparcv9 = sqlite3-64.patch
+PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch
+PATCHFILES_isa-amd64 = sqlite3-64.patch
+PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch
+
+
+
GARNAME = nss
MAJOR_VERSION = 3
MINOR_VERSION = 12
@@ -33,7 +48,6 @@
RTM_NAME = NSS_3_12_4_RTM
MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTNAME = $(GARNAME)-$(GARVERSION)
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
REQUIRED_PKGS = CSWnspr CSWsqlite3
PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel
@@ -42,11 +56,12 @@
INSTALL_SCRIPTS = nss
TEST_SCRIPTS =
BUILD64 = 1
+EXTRA_INC = $(prefix)/include
libdir_install = $(prefix)/lib
includedir = $(prefix)/include/nss
-ifeq (OPT,$(GARFLAVOR))
+ifneq (DBG,$(GARFLAVOR))
BUILD_OPT = 1
export BUILD_OPT
endif
@@ -58,6 +73,10 @@
NSS_ENABLE_ECC = 1
export NSS_ENABLE_ECC
+# To avoid creating /opt/csw/lib/libsqlite3.so (already exists)
+NSS_USE_SYSTEM_SQLITE = 1
+export NSS_USE_SYSTEM_SQLITE
+
# 64-bit suppport
ifeq ($(MODULATION),isa-sparcv9)
USE_64 = 1
@@ -74,9 +93,8 @@
endif
export NSPR_LIB_DIR
-# For DBG builds
-PATCHFILES = whoami.patch
-
+# Based on:
+# http://mxr.mozilla.org/security/source/security/nss/pkg/solaris/SUNWtlsu/prototype_com
NSS_BINARIES = addbuiltin
NSS_BINARIES += certutil
NSS_BINARIES += cmsutil
@@ -95,25 +113,24 @@
build-coreconf:
(cd $(WORKSRC)/mozilla/security/coreconf \
&& \
- $(BUILD_ENV) \
- && \
- gmake -j1 CC="$(CC)")
+ CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \
+ gmake -j1)
@$(MAKECOOKIE)
build-dbm:
(cd $(WORKSRC)/mozilla/security/dbm \
&& \
- $(BUILD_ENV) \
- && \
- gmake -j1 CC="$(CC)")
+ CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \
+ gmake -j1)
@$(MAKECOOKIE)
+# There's an extra interpolation somehwere inside nss' build system, so $$$$
+# needs to be used instead of $$.
build-nss-compile:
(cd $(WORKSRC)/mozilla/security/nss \
&& \
- $(BUILD_ENV) \
- && \
- gmake -j1 CC="$(CC)")
+ CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS) -R/opt/csw/lib/$$$$ISALIST' \
+ gmake -j1)
@$(MAKECOOKIE)
install-nss:
@@ -135,8 +152,10 @@
do \
ginstall -m 644 $${f} $(DESTDIR)$(includedir); \
done
- for bin in in $(WORKSRC)/mozilla/dist/*/bin/* ; do \
- ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss`basename $${file}`; \
+ for bin in $(NSS_BINARIES); do \
+ ginstall -m 755 \
+ $(WORKSRC)/mozilla/dist/*/bin/$${bin} \
+ $(DESTDIR)$(bindir)/`basename $${file}`; \
done
# Asserting that we have the right version in the .pc file
ggrep "Version: $(GARVERSION)" $(FILEDIR)/nss.pc \
Modified: csw/mgar/pkg/nss/branches/upstream-work/checksums
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/checksums 2009-11-27 13:48:44 UTC (rev 7479)
+++ csw/mgar/pkg/nss/branches/upstream-work/checksums 2009-11-27 14:26:44 UTC (rev 7480)
@@ -1,2 +1,8 @@
-8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz
+4b2246d07092fe8b2f29a1a01e9bc821 include.patch
+79083e118f3d885957910fc845844c1c ld-options.patch
+1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz
+bd8d96c42238c7cfd07ec1ba21191066 platlibs-sqlite3-64.patch
+f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch
+cae46161d981e8aea822953b34339e60 sqlite3-32.patch
+b07d3de42785866c3c4385846fd8eb52 sqlite3-64.patch
221646aa1954b4a255ac03e7d8b0225d whoami.patch
Added: csw/mgar/pkg/nss/branches/upstream-work/files/include.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/include.patch (rev 0)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/include.patch 2009-11-27 14:26:44 UTC (rev 7480)
@@ -0,0 +1,11 @@
+--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 09:29:22.101030210 +0100
++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 09:29:33.419484372 +0100
+@@ -104,7 +104,7 @@
+ endif
+ endif
+
+-INCLUDES += -I/usr/dt/include -I/usr/openwin/include
++INCLUDES += -I/usr/dt/include -I/usr/openwin/include $(CPPFLAGS)
+
+ RANLIB = echo
+ CPU_ARCH = sparc
Added: csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch (rev 0)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch 2009-11-27 14:26:44 UTC (rev 7480)
@@ -0,0 +1,10 @@
+--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 11:52:54.279684353 +0100
++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 11:53:05.767884648 +0100
+@@ -175,6 +175,6 @@
+ RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
+ endif
+ else
+-RPATH = -R '$$ORIGIN'
++RPATH = $(LDFLAGS) $(LD_OPTIONS)
+ endif
+
Added: csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch (rev 0)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch 2009-11-27 14:26:44 UTC (rev 7480)
@@ -0,0 +1,11 @@
+--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-23 14:17:29.741267874 +0100
++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-23 14:17:41.292422026 +0100
+@@ -82,7 +82,7 @@
+ endif
+ endif
+
+-SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3
++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib/64 -lsqlite3
+
+ ifdef NSS_DISABLE_DBM
+ DBMLIB = $(NULL)
Added: csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch (rev 0)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch 2009-11-27 14:26:44 UTC (rev 7480)
@@ -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)
Added: csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch (rev 0)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch 2009-11-27 14:26:44 UTC (rev 7480)
@@ -0,0 +1,18 @@
+--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100
++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:19.891579729 +0100
+@@ -57,6 +57,7 @@
+ -L$(DIST)/lib \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
++ -L/opt/csw/lib \
+ -lsqlite3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
+@@ -83,6 +84,7 @@
+ -L$(DIST)/lib \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
++ -L/opt/csw/lib \
+ -lsqlite3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
Added: csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch (rev 0)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch 2009-11-27 14:26:44 UTC (rev 7480)
@@ -0,0 +1,18 @@
+--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100
++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:48.846636621 +0100
+@@ -57,6 +57,7 @@
+ -L$(DIST)/lib \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
++ -L/opt/csw/lib/64 \
+ -lsqlite3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
+@@ -83,6 +84,7 @@
+ -L$(DIST)/lib \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
++ -L/opt/csw/lib/64 \
+ -lsqlite3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list