[gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/files/, dev-libs/nss/

[Jory Pratt]

commit:     41ac5c8b4518396bfa55f9a82a6b8c3054c6751b
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 20:28:29 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 20:28:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=41ac5c8b

re-add support for solaris in nss-3.13.1

---
 dev-libs/nss/Manifest                           |    3 +-
 dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch |   34 +++++++++++++++++++++++
 dev-libs/nss/nss-3.13.1.ebuild                  |    2 +
 3 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 2d762fa..60cae33 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,4 +1,5 @@
 AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db18f2f80a71c776 SHA1 e50b55be77f62516f735acfb41a1e47509572cd8 SHA256 24593640e682cb7a831cd8a0888397b7b20880c9cfabed76bb647cc12385aef6
 AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329
+AUX nss-3.13.1-solaris-gcc.patch 994 RMD160 f6bfc9b34aebf2fd4b47187884fe572e446aa2c0 SHA1 37ad83887a91073c94bbed698677b82160392771 SHA256 2633e73f8bba27fb34b5872464946b1abe03a7e73e544be4f751655c6276487b
 DIST nss-3.13.1.tar.gz 5985329 RMD160 c1743308c380169d666e5c08b23a455f86b360bd SHA1 d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 SHA256 95d933b59be466f19f90f595a35b4b92213fef084caecafeb89f4e2ce7160660
-EBUILD nss-3.13.1.ebuild 6548 RMD160 df35794b23d838ff6b9cacbd458660e98288c372 SHA1 f202807a79f289ace368daebcaba7c68d85feca5 SHA256 3fedaa7814415599ade07cc7afba0dd9ae1b17261da117d47575615db916eeef
+EBUILD nss-3.13.1.ebuild 6598 RMD160 6666ded00faecb9137904d4dbd6c868ce79d6ecd SHA1 355b26254bab843a60abdffddeb7e95ca3bdaf1b SHA256 4fcac6a6009f35b3341eb07028de2a9755a6c5e47d710b5514709e3573c159ce

diff --git a/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch b/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch
new file mode 100644
index 0000000..5622ff9
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch
@@ -0,0 +1,34 @@
+diff -urN a/mozilla/security/coreconf/SunOS5.mk b/mozilla/security/coreconf/SunOS5.mk
+--- a/mozilla/security/coreconf/SunOS5.mk	2011-10-19 13:13:36.000000000 -0500
++++ b/mozilla/security/coreconf/SunOS5.mk	2011-10-31 15:19:08.182996818 -0500
+@@ -37,6 +37,9 @@
+ 
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+ 
++NS_USE_GCC = 1
++GCC_USE_GNU_LD = 1
++
+ # Sun's WorkShop defines v8, v8plus and v9 architectures.
+ # gcc on Solaris defines v8 and v9 "cpus".  
+ # gcc's v9 is equivalent to Workshop's v8plus.
+@@ -95,7 +98,7 @@
+ 	endif
+ endif
+ 
+-INCLUDES   += -I/usr/dt/include -I/usr/openwin/include
++#INCLUDES   += -I/usr/dt/include -I/usr/openwin/include
+ 
+ RANLIB      = echo
+ CPU_ARCH    = sparc
+@@ -105,11 +108,6 @@
+ NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)
+ 
+ MKSHLIB  = $(CC) $(DSO_LDOPTS) $(RPATH)
+-ifdef NS_USE_GCC
+-ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1)))
+-	GCC_USE_GNU_LD = 1
+-endif
+-endif
+ ifdef MAPFILE
+ ifdef NS_USE_GCC
+ ifdef GCC_USE_GNU_LD

diff --git a/dev-libs/nss/nss-3.13.1.ebuild b/dev-libs/nss/nss-3.13.1.ebuild
index 6936143..475cade 100644
--- a/dev-libs/nss/nss-3.13.1.ebuild
+++ b/dev-libs/nss/nss-3.13.1.ebuild
@@ -44,6 +44,8 @@ src_prepare() {
 	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
 		"${S}"/mozilla/security/nss/config/Makefile
 
+	epatch ${FILESDIR}/nss-3.13.1-solaris-gcc.patch
+
 	# dirty hack
 	cd "${S}"/mozilla/security/nss
 	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \