diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2010-02-12 14:04:57 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2010-02-12 14:04:57 +0000 |
| commit | 87468ced0e211a64041711f9ef7275da58e0bd4b (patch) | |
| tree | 74b4bd81b1598a5538f3206b32de9d898f541857 /dev-libs/nss | |
| parent | Require SLOT="0" of media-libs/jpeg for headers. (diff) | |
| download | gentoo-2-87468ced0e211a64041711f9ef7275da58e0bd4b.tar.gz gentoo-2-87468ced0e211a64041711f9ef7275da58e0bd4b.tar.bz2 gentoo-2-87468ced0e211a64041711f9ef7275da58e0bd4b.zip | |
Fix bugs #304687, #304571
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/nss')
| -rw-r--r-- | dev-libs/nss/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.12.5-r1.ebuild | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index 71e735bbc6ab..728bb86e90d0 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/nss # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.171 2010/02/11 20:52:15 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.172 2010/02/12 14:04:57 anarchy Exp $ + + 12 Feb 2010; <anarchy@gentoo.org> nss-3.12.5-r1.ebuild: + Fix bugs #304687, #304571 11 Feb 2010; <anarchy@gentoo.org> nss-3.12.5-r1.ebuild: Ensure we update nspr before nss diff --git a/dev-libs/nss/nss-3.12.5-r1.ebuild b/dev-libs/nss/nss-3.12.5-r1.ebuild index 44bb8dc4c0c5..d85f6a651024 100644 --- a/dev-libs/nss/nss-3.12.5-r1.ebuild +++ b/dev-libs/nss/nss-3.12.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.5-r1.ebuild,v 1.2 2010/02/11 20:52:15 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.5-r1.ebuild,v 1.3 2010/02/12 14:04:57 anarchy Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -51,15 +51,16 @@ src_compile() { *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; esac + export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 + export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` + export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L//'` export BUILD_OPT=1 export NSS_USE_SYSTEM_SQLITE=1 - export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` export NSDISTMODE=copy export NSS_ENABLE_ECC=1 export XCFLAGS="${CFLAGS}" export FREEBL_NO_DEPEND=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 cd "${S}"/mozilla/security/coreconf emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" @@ -94,12 +95,12 @@ src_install () { done if use utils; then - local nssutil - nssutils="certutil crlutil cmsutil modutil pk12util signtool signver ssltrap addbuiltin" + local nssutils + nssutils="certutil crlutil cmsutil modutil pk12util signtool signver ssltap addbuiltin" cd "${S}"/mozilla/security/dist/*/bin/ for f in $nssutils; do - newbin ${f} + dobin ${f} done fi } |