[csw-devel] SF.net SVN: gar:[7381] csw/mgar/pkg/nss/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sun Nov 22 15:50:31 CET 2009
Revision: 7381
http://gar.svn.sourceforge.net/gar/?rev=7381&view=rev
Author: wahwah
Date: 2009-11-22 14:50:31 +0000 (Sun, 22 Nov 2009)
Log Message:
-----------
nss: Tyding up the Makefile, added a patch showing how to debug shlibsign
Modified Paths:
--------------
csw/mgar/pkg/nss/trunk/Makefile
csw/mgar/pkg/nss/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch
Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 12:46:36 UTC (rev 7380)
+++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-22 14:50:31 UTC (rev 7381)
@@ -2,19 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+
+# Based on the following resources:
+# - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup
+# - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions
+# - https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables
+# - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide
+
+# Debugging mode, this is work in progress.
GARFLAVOR = DBG
-# Based on:
-# http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup
-# and
-# https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions
-# and
-# https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables
-# and
-# https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide
GARNAME = nss
GARVERSION = 3.12.4
-# http://www.gentoo-portage.com/AJAX/Ebuild/96014
CATEGORIES = lib
DESCRIPTION = Network Security Services library, implements PKI support
define BLURB
@@ -22,25 +21,24 @@
SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/
# 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 = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/
-# http://bugs.gentoo.org/show_bug.cgi?id=256102
+MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/
+# This patch taken from http://bugs.gentoo.org/show_bug.cgi?id=256102
PATCHFILES = nss-3.12.4.patch
PATCHFILES += shared-libs.patch
PATCHFILES += platlibs-sqlite3.patch
+PATCHFILES += platlibs-sunos.patch
PATCHFILES += whoami.patch
PATCHFILES += runtime-search-path.patch
-# DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES = $(GARNAME)-$(GARVERSION)-with-nspr-4.8.tar.gz
-DISTNAME = $(GARNAME)-$(GARVERSION)-with-nspr-4.8
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+DIST_SUFFIX = -with-nspr-4.8
+DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz
+DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX)
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz
REQUIRED_PKGS = CSWnspr CSWsqlite3
PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel
CONFIGURE_SCRIPTS = nss
BUILD_SCRIPTS = nss
INSTALL_SCRIPTS = nss
TEST_SCRIPTS =
-CONFIGURE_ARGS = $(DIRPATHS)
BUILD64 = 1
EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
@@ -54,7 +52,7 @@
ZLIB_LIBS = -lz
NSDISTMODE = copy
NSS_ENABLE_ECC = 1
-XCFLAGS=$(CFLAGS)
+XCFLAGS = $(CFLAGS)
FREEBL_NO_DEPEND = 1
LDOPTS = $(LD_OPTIONS)
ifeq ($(MODULATION),isa-sparcv9)
@@ -76,33 +74,19 @@
respect-ldflags:
(cd $(WORKSRC)/mozilla/security/coreconf \
&& \
- gsed -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \
- -i source.mk \
+ gsed -i -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \
+ source.mk \
&& \
gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk)
@$(MAKECOOKIE)
add-runtime-search-path:
- # Make sure that the runtime search path is added for NSPR libraries.
- for f in \
- mozilla/security/nss/cmd/pk11mode/Makefile \
- mozilla/security/nss/cmd/platlibs.mk \
- mozilla/security/nss/cmd/shlibsign/Makefile \
- mozilla/security/nss/cmd/shlibsign/mangle/Makefile \
- mozilla/security/nss/lib/ckfw/builtins/Makefile \
- mozilla/security/nss/lib/ckfw/capi/Makefile \
- mozilla/security/nss/lib/ckfw/nssmkey/Makefile \
- mozilla/security/nss/lib/freebl/config.mk \
- mozilla/security/nss/lib/nss/config.mk \
- mozilla/security/nss/lib/smime/config.mk \
- mozilla/security/nss/lib/softoken/config.mk \
- mozilla/security/nss/lib/softoken/legacydb/config.mk \
- mozilla/security/nss/lib/ssl/config.mk \
- mozilla/security/nss/lib/util/config.mk; do \
- gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' $(WORKSRC)/$$f; \
- done;
+ # Make sure that the runtime search path is added in all Makefiles.
+ gfind $(WORKSRC) \( -name Makefile -o -name '*.mk' \) \
+ -exec gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' \
+ {} \;
# A form of assert
- ggrep -- -R $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk
+ gegrep -- '-R.*ISALIST' $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk
@$(MAKECOOKIE)
build-nss: build-coreconf build-dbm build-nss-compile
Modified: csw/mgar/pkg/nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/nss/trunk/checksums 2009-11-22 12:46:36 UTC (rev 7380)
+++ csw/mgar/pkg/nss/trunk/checksums 2009-11-22 14:50:31 UTC (rev 7381)
@@ -1,6 +1,7 @@
8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz
39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch
f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch
+441f12a9396a89841d384d8c89a052ff platlibs-sunos.patch
d41d8cd98f00b204e9800998ecf8427e runtime-search-path.patch
90b4d32437b3e3fdadcf4f16339aa2ed shared-libs.patch
221646aa1954b4a255ac03e7d8b0225d whoami.patch
Added: csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch 2009-11-22 14:50:31 UTC (rev 7381)
@@ -0,0 +1,15 @@
+This file shows how to run shlibsign under dbx, the Sun Studio debugger, to see
+where it's aborting.
+
+--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh.orig 2009-11-22 15:17:12.069116849 +0100
++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh 2009-11-22 15:17:54.559576926 +0100
+@@ -34,7 +34,7 @@
+ export LIBRARY_PATH
+ ADDON_PATH=${1}/lib:${4}:$ADDON_PATH
+ export ADDON_PATH
+- echo ${2}/shlibsign -v -i ${5}
+- ${2}/shlibsign -v -i ${5}
++ echo /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5}
++ /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5}
+ ;;
+ esac
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