[csw-devel] SF.net SVN: gar:[7389] csw/mgar/pkg/nss/branches/upstream-work
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Mon Nov 23 01:59:26 CET 2009
Revision: 7389
http://gar.svn.sourceforge.net/gar/?rev=7389&view=rev
Author: wahwah
Date: 2009-11-23 00:59:26 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
nss/branches/upstream-work: The simplest version of the build, to work with the upstream developers.
Modified Paths:
--------------
csw/mgar/pkg/nss/branches/upstream-work/Makefile
Removed Paths:
-------------
csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch
csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch
csw/mgar/pkg/nss/branches/upstream-work/files/runtime-search-path.patch
csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch
csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch
csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch
Modified: csw/mgar/pkg/nss/branches/upstream-work/Makefile
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-23 00:35:23 UTC (rev 7388)
+++ csw/mgar/pkg/nss/branches/upstream-work/Makefile 2009-11-23 00:59:26 UTC (rev 7389)
@@ -22,39 +22,29 @@
# TODO: Generate RTM_NAME from GARVERSION
RTM_NAME = NSS_3_12_4_RTM
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
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
+CONFIGURE_SCRIPTS =
BUILD_SCRIPTS = nss
INSTALL_SCRIPTS = nss
TEST_SCRIPTS =
BUILD64 = 1
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
ifeq (OPT,$(GARFLAVOR))
BUILD_OPT = 1
endif
-NSS_USE_SYSTEM_SQLITE = 1
+
+# NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig
NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//')
+export NSPR_INCLUDE_DIR
NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')
-USE_SYSTEM_ZLIB = 1
-ZLIB_LIBS = -lz
-NSDISTMODE = copy
-NSS_ENABLE_ECC = 1
-XCFLAGS = $(CFLAGS)
-FREEBL_NO_DEPEND = 1
-LDOPTS = $(LD_OPTIONS)
+export NSPR_LIB_DIR
+
+# 64-bit suppport
ifeq ($(MODULATION),isa-sparcv9)
USE_64 = 1
export USE_64
@@ -63,32 +53,9 @@
USE_64 = 1
export USE_64
endif
-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
-configure-nss: respect-ldflags add-runtime-search-path
- @$(MAKECOOKIE)
-
-respect-ldflags:
- (cd $(WORKSRC)/mozilla/security/coreconf \
- && \
- 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 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
- gegrep -- '-R.*ISALIST' $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk
- @$(MAKECOOKIE)
-
build-nss: build-coreconf build-dbm build-nss-compile
build-coreconf:
@@ -114,4 +81,3 @@
&& \
gmake -j1 CC="$(CC)")
@$(MAKECOOKIE)
-
Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch 2009-11-23 00:35:23 UTC (rev 7388)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/nss-3.12.4.patch 2009-11-23 00:59:26 UTC (rev 7389)
@@ -1,141 +0,0 @@
---- mozilla/security/nss/lib/freebl/stubs.c.dist 2009-09-16 17:46:24.600678560 +0100
-+++ b/mozilla/security/nss/lib/freebl/stubs.c 2009-09-16 18:09:59.275307160 +0100
-@@ -70,9 +70,32 @@
- #include <secitem.h>
- #include <blapi.h>
-
--#define FREEBL_NO_WEAK 1
-+#ifdef __sgi
-+# include <rld_interface.h>
-+# ifndef _RLD_INTERFACE_DLFCN_H_DLADDR
-+# define _RLD_INTERFACE_DLFCN_H_DLADDR
-+ typedef struct Dl_info {
-+ const char * dli_fname;
-+ void * dli_fbase;
-+ const char * dli_sname;
-+ void * dli_saddr;
-+ int dli_version;
-+ int dli_reserved1;
-+ long dli_reserved[4];
-+ } Dl_info;
-+# endif
-+# define _RLD_DLADDR 14
-+int dladdr(void *address, Dl_info *dl);
-+
-+int dladdr(void *address, Dl_info *dl)
-+{
-+ void *v;
-+ v = _rld_new_interface(_RLD_DLADDR,address,dl);
-+ return (int)v;
-+}
-+#endif
-
--#define WEAK __attribute__((weak))
-+#define FREEBL_NO_WEAK 1
-
- #ifdef FREEBL_NO_WEAK
-
-@@ -93,17 +116,17 @@
- static type_##fn ptr_##fn = NULL
-
- #define STUB_SAFE_CALL0(fn) \
-- if (ptr_##fn) { return ptr_##fn(); }
-+ if (ptr_##fn) { ptr_##fn(); }
- #define STUB_SAFE_CALL1(fn,a1) \
-- if (ptr_##fn) { return ptr_##fn(a1); }
-+ if (ptr_##fn) { ptr_##fn(a1); }
- #define STUB_SAFE_CALL2(fn,a1,a2) \
-- if (ptr_##fn) { return ptr_##fn(a1,a2); }
-+ if (ptr_##fn) { ptr_##fn(a1,a2); }
- #define STUB_SAFE_CALL3(fn,a1,a2,a3) \
-- if (ptr_##fn) { return ptr_##fn(a1,a2,a3); }
-+ if (ptr_##fn) { ptr_##fn(a1,a2,a3); }
- #define STUB_SAFE_CALL4(fn,a1,a2,a3,a4) \
-- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4); }
-+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4); }
- #define STUB_SAFE_CALL6(fn,a1,a2,a3,a4,a5,a6) \
-- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4,a5,a6); }
-+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4,a5,a6); }
-
- #define STUB_FETCH_FUNCTION(fn) \
- ptr_##fn = (type_##fn) dlsym(lib,#fn); \
-@@ -118,6 +141,8 @@
- * libutil will not resolve these symbols.
- */
-
-+#define WEAK __attribute__((weak))
-+
- #define STUB_DECLARE(ret, fn, args) \
- WEAK extern ret fn args
-
-@@ -200,7 +225,7 @@ extern void
- PORT_Free_stub(void *ptr)
- {
- STUB_SAFE_CALL1(PORT_Free_Util, ptr);
-- return free(ptr);
-+ free(ptr);
- }
-
- extern void *
-@@ -220,14 +245,14 @@ PORT_ZFree_stub(void *ptr, size_t len)
- {
- STUB_SAFE_CALL2(PORT_ZFree_Util, ptr, len);
- memset(ptr, 0, len);
-- return free(ptr);
-+ free(ptr);
- }
-
- extern void
- PR_Free_stub(void *ptr)
- {
- STUB_SAFE_CALL1(PR_Free, ptr);
-- return free(ptr);
-+ free(ptr);
- }
-
- /*
-@@ -530,7 +555,7 @@ freebl_InitNSSUtil(void *lib)
- * fetch the library if it's loaded. For NSS it should already be loaded
- */
- #define freebl_getLibrary(libName) \
-- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD)
-+ dlopen (libName, RTLD_LAZY)
-
- #define freebl_releaseLibrary(lib) \
- if (lib) dlclose(lib)
-@@ -538,7 +563,7 @@ freebl_InitNSSUtil(void *lib)
- static void * FREEBLnsprGlobalLib = NULL;
- static void * FREEBLnssutilGlobalLib = NULL;
-
--void __attribute ((destructor)) FREEBL_unload()
-+void FREEBL_unload()
- {
- freebl_releaseLibrary(FREEBLnsprGlobalLib);
- freebl_releaseLibrary(FREEBLnssutilGlobalLib);
---- mozilla/security/nss/lib/freebl/nsslowhash.c.dist 2009-09-16 18:16:17.529500640 +0100
-+++ b/mozilla/security/nss/lib/freebl/nsslowhash.c 2009-09-16 18:16:37.634080480 +0100
-@@ -375,21 +375,21 @@ NSSLOWHASH_NewContext(NSSLOWInitContext
- void
- NSSLOWHASH_Begin(NSSLOWHASHContext *context)
- {
-- return context->hashObj->begin(context->hashCtxt);
-+ context->hashObj->begin(context->hashCtxt);
- }
-
- void
- NSSLOWHASH_Update(NSSLOWHASHContext *context, const unsigned char *buf,
- unsigned int len)
- {
-- return context->hashObj->update(context->hashCtxt, buf, len);
-+ context->hashObj->update(context->hashCtxt, buf, len);
- }
-
- void
- NSSLOWHASH_End(NSSLOWHASHContext *context, unsigned char *buf,
- unsigned int *ret, unsigned int len)
- {
-- return context->hashObj->end(context->hashCtxt, buf, ret, len);
-+ context->hashObj->end(context->hashCtxt, buf, ret, len);
- }
-
- void
Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch 2009-11-23 00:35:23 UTC (rev 7388)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch 2009-11-23 00:59:26 UTC (rev 7389)
@@ -1,11 +0,0 @@
---- 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)
Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch 2009-11-23 00:35:23 UTC (rev 7388)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/shared-libs.patch 2009-11-23 00:59:26 UTC (rev 7389)
@@ -1,32 +0,0 @@
---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-22 11:39:49.492474635 +0100
-+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-22 11:40:51.857227138 +0100
-@@ -54,10 +54,14 @@
-
- ifdef NS_USE_GCC
- EXTRA_SHARED_LIBS += \
-+ -R/opt/csw/lib/$$ISALIST \
-+ -L/opt/csw/lib \
- -L$(DIST)/lib \
-+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \
- -L$(NSSUTIL_LIB_DIR) \
- -lnssutil3 \
- -lsqlite3 \
-+ -R$(NSPR_LIB_DIR)/$$ISALIST \
- -L$(NSPR_LIB_DIR) \
- -lplc4 \
- -lplds4 \
-@@ -80,10 +84,14 @@
- # $(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 \
-+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \
- -L$(NSSUTIL_LIB_DIR) \
- -lnssutil3 \
- -lsqlite3 \
-+ -R$(NSPR_LIB_DIR)/$$ISALIST \
- -L$(NSPR_LIB_DIR) \
- -lplc4 \
- -lplds4 \
Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch 2009-11-23 00:35:23 UTC (rev 7388)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/sign-under-dbx.patch 2009-11-23 00:59:26 UTC (rev 7389)
@@ -1,15 +0,0 @@
-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
Deleted: csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch
===================================================================
--- csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch 2009-11-23 00:35:23 UTC (rev 7388)
+++ csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch 2009-11-23 00:59:26 UTC (rev 7389)
@@ -1,11 +0,0 @@
---- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100
-+++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100
-@@ -46,7 +46,7 @@
- DEFINES += -UDEBUG -DNDEBUG
- else
- OPTIMIZER += -g
-- USERNAME := $(shell whoami)
-+ USERNAME := $(shell gwhoami)
- USERNAME := $(subst -,_,$(USERNAME))
- DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME)
- endif
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