Revision: 20081
http://gar.svn.sourceforge.net/gar/?rev=20081&view=rev
Author: cgrzemba
Date: 2013-01-11 08:59:46 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
nss/trunk: rework for direct binding
Modified Paths:
--------------
csw/mgar/pkg/nss/trunk/Makefile
csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch
csw/mgar/pkg/nss/trunk/files/ld-options.patch
Added Paths:
-----------
csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch
Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile 2013-01-10 23:00:37 UTC (rev 20080)
+++ csw/mgar/pkg/nss/trunk/Makefile 2013-01-11 08:59:46 UTC (rev 20081)
@@ -175,7 +175,6 @@
RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibnspr4
RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibplds4
RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibsmime3
-RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibssl3
RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibnssutil3
# plugins accessed via dlopen
RUNTIME_DEP_PKGS_CSWnss3-tools += CSWlibsoftokn3
@@ -186,13 +185,15 @@
CHECKPKG_OVERRIDES_CSWnss3-tools += surplus-dependency|CSWlibsoftokn3
OBSOLETED_BY_CSWnss3-tools = CSWlibnss3-tools
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-dev CSWlibsqlite3-dev
+BUILD_DEP_PKGS += CSWnspr-dev
+BUILD_DEP_PKGS += CSWlibsqlite3-dev
+# BUILD64 = 1
+
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS = nss
INSTALL_SCRIPTS = nss
TEST_SCRIPTS =
-BUILD64 = 1
MERGE_DIRS_isa-sparcv9 = $(libdir)
MERGE_DIRS_isa-amd64 = $(libdir)
@@ -204,7 +205,8 @@
ifneq (DBG,$(GARFLAVOR))
BUILD_OPT = 1
export BUILD_OPT
- CONFIGURE_ARGS += --disable-debug --enable-optimize
+# no configure target
+# CONFIGURE_ARGS += --disable-debug --enable-optimize
endif
# NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig
@@ -234,12 +236,16 @@
endif
export NSPR_LIB_DIR
+LD_OPTIONS = -z ignore -Bdirect
ifeq ($(USE_64),1)
-SQLITE_LIB_DIR = /opt/csw/lib/64
+ SQLITE_LIB_DIR = /opt/csw/lib/64
+ LD_OPTIONS += -R/opt/csw/lib/64/$$$$ISALIST
else
-SQLITE_LIB_DIR = /opt/csw/lib
+ SQLITE_LIB_DIR = /opt/csw/lib
+ LD_OPTIONS += -R/opt/csw/lib/$$$$ISALIST
endif
export SQLITE_LIB_DIR
+
SQLITE_INCLUDE_DIR = /opt/csw/include
export SQLITE_INCLUDE_DIR
@@ -262,21 +268,16 @@
# Required patches.
PATCHFILES += include.patch
-PATCHFILES += ld-options.patch
+# PATCHFILES += ld-options.patch
PATCHFILES += 0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
PATCHFILES += 0006-platlibs.mk-linking-bltest.patch
PATCHFILES += 0006-config.mk-linking.patch
+PATCHFILES += 0005-SunOS5.mk.patch
PATCHFILES += 0005-change-rpath-for-bins-in-platlibs.mk.patch
# http://lists.opencsw.org/pipermail/pkgsubmissions/2010-February/000167.html
# NOISAEXEC = 1
-CPPFLAGS =
-LD_OPTIONS =
-# NSS_LD_OPTIONS = -R'$$ORIGIN'
-
-
-
include gar/category.mk
build-nss: build-coreconf build-dbm build-nss-compile
@@ -301,7 +302,7 @@
build-nss-compile:
(cd $(WORKSRC)/mozilla/security/nss \
&& \
- gmake -j1 RPATH=-R\'/opt/csw/lib/\$$\$$ISALIST\' BUILD_SUN_PKG=1)
+ gmake -j1 LD_OPTIONS='$(LD_OPTIONS)' BUILD_SUN_PKG=1)
@$(MAKECOOKIE)
install-nss:
Added: csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch
(rev 0)
+++ csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch 2013-01-11 08:59:46 UTC
(rev 20081)
@@ -0,0 +1,19 @@
+--- a/mozilla/security/coreconf/SunOS5.mk
++++ b/mozilla/security/coreconf/SunOS5.mk
+@@ -125,15 +125,6 @@ endif
+
+ NOSUCHFILE = /solaris-rm-f-sucks
+
+-ifeq ($(BUILD_SUN_PKG), 1)
+ # The -R '$ORIGIN' linker option instructs this library to search for its
+ # dependencies in the same directory where it resides.
+-ifeq ($(USE_64), 1)
+-RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
+-else
+-RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
+-endif
+-else
+-RPATH = -R '$$ORIGIN'
++RPATH = $(LD_OPTIONS)
+-endif
+-
Modified:
csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch
===================================================================
---
csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch
2013-01-10 23:00:37 UTC (rev 20080)
+++
csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch
2013-01-11 08:59:46 UTC (rev 20081)
@@ -5,10 +5,10 @@
ifeq ($(OS_ARCH), SunOS)
ifeq ($(USE_64), 1)
-EXTRA_SHARED_LIBS += -R
'$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
-+EXTRA_SHARED_LIBS += -R '/opt/csw/lib/64/$$ISALIST'
++EXTRA_SHARED_LIBS += -Bdirect -R '/opt/csw/lib/64/$$ISALIST'
else
-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
-+EXTRA_SHARED_LIBS += -R '/opt/csw/lib/$$ISALIST'
++EXTRA_SHARED_LIBS += $(LD_OPTIONS)
endif
endif
Modified: csw/mgar/pkg/nss/trunk/files/ld-options.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/ld-options.patch 2013-01-10 23:00:37 UTC
(rev 20080)
+++ csw/mgar/pkg/nss/trunk/files/ld-options.patch 2013-01-11 08:59:46 UTC
(rev 20081)
@@ -5,6 +5,6 @@
endif
else
-RPATH = -R '$$ORIGIN'
-+RPATH = $(LDFLAGS) $(LD_OPTIONS)
++RPATH = $(LD_OPTIONS)
endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
