From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RKyTV-0003Hi-Ib for garchives@archives.gentoo.org; Mon, 31 Oct 2011 20:28:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F75B21C05A; Mon, 31 Oct 2011 20:28:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4F9B921C05A for ; Mon, 31 Oct 2011 20:28:46 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AFECD1B4016 for ; Mon, 31 Oct 2011 20:28:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2582180042 for ; Mon, 31 Oct 2011 20:28:45 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <41ac5c8b4518396bfa55f9a82a6b8c3054c6751b.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/files/, dev-libs/nss/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nss/Manifest dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch dev-libs/nss/nss-3.13.1.ebuild X-VCS-Directories: dev-libs/nss/files/ dev-libs/nss/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 41ac5c8b4518396bfa55f9a82a6b8c3054c6751b Date: Mon, 31 Oct 2011 20:28:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 99d855ea-77ff-4e67-b22d-a1afb04abbb8 X-Archives-Hash: 2a79963cc5c4cca127c3aae563dc69a3 commit: 41ac5c8b4518396bfa55f9a82a6b8c3054c6751b Author: Jory A. Pratt gentoo org> AuthorDate: Mon Oct 31 20:28:29 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon Oct 31 20:28:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D41ac5c8b 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 af35db729406c62d0e8582e7db= 18f2f80a71c776 SHA1 e50b55be77f62516f735acfb41a1e47509572cd8 SHA256 24593= 640e682cb7a831cd8a0888397b7b20880c9cfabed76bb647cc12385aef6 AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f= 29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA2= 56 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329 +AUX nss-3.13.1-solaris-gcc.patch 994 RMD160 f6bfc9b34aebf2fd4b47187884fe= 572e446aa2c0 SHA1 37ad83887a91073c94bbed698677b82160392771 SHA256 2633e73= f8bba27fb34b5872464946b1abe03a7e73e544be4f751655c6276487b DIST nss-3.13.1.tar.gz 5985329 RMD160 c1743308c380169d666e5c08b23a455f86= b360bd SHA1 d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 SHA256 95d933b59be46= 6f19f90f595a35b4b92213fef084caecafeb89f4e2ce7160660 -EBUILD nss-3.13.1.ebuild 6548 RMD160 df35794b23d838ff6b9cacbd458660e9828= 8c372 SHA1 f202807a79f289ace368daebcaba7c68d85feca5 SHA256 3fedaa78144155= 99ade07cc7afba0dd9ae1b17261da117d47575615db916eeef +EBUILD nss-3.13.1.ebuild 6598 RMD160 6666ded00faecb9137904d4dbd6c868ce79= d6ecd SHA1 355b26254bab843a60abdffddeb7e95ca3bdaf1b SHA256 4fcac6a6009f35= b3341eb07028de2a9755a6c5e47d710b5514709e3573c159ce diff --git a/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch b/dev-libs/n= ss/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/corec= onf/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 @@ +=20 + include $(CORE_DEPTH)/coreconf/UNIX.mk +=20 ++NS_USE_GCC =3D 1 ++GCC_USE_GNU_LD =3D 1 ++ + # Sun's WorkShop defines v8, v8plus and v9 architectures. + # gcc on Solaris defines v8 and v9 "cpus". =20 + # gcc's v9 is equivalent to Workshop's v8plus. +@@ -95,7 +98,7 @@ + endif + endif +=20 +-INCLUDES +=3D -I/usr/dt/include -I/usr/openwin/include ++#INCLUDES +=3D -I/usr/dt/include -I/usr/openwin/include +=20 + RANLIB =3D echo + CPU_ARCH =3D sparc +@@ -105,11 +108,6 @@ + NOMD_OS_CFLAGS +=3D $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS) +=20 + MKSHLIB =3D $(CC) $(DSO_LDOPTS) $(RPATH) +-ifdef NS_USE_GCC +-ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=3Dld` -v 2>&= 1))) +- GCC_USE_GNU_LD =3D 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.ebu= ild 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 =3D/s:=3D /usr:=3D ${EPREFIX}/usr:" \ "${S}"/mozilla/security/nss/config/Makefile =20 + 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):" \