diff options
| -rw-r--r-- | dev-libs/nss/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.11.9.ebuild | 12 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.12.ebuild | 12 |
3 files changed, 21 insertions, 9 deletions
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index f73d5ce49b59..b453e96e176c 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nss # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.125 2008/08/06 10:37:26 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.126 2008/08/13 19:26:47 armin76 Exp $ + + 13 Aug 2008; Raúl Porcel <armin76@gentoo.org> nss-3.11.9.ebuild, + nss-3.12.ebuild: + Respect LDFLAGS, bug #181792 06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml: Add USE flag description to metadata wrt GLEP 56. diff --git a/dev-libs/nss/nss-3.11.9.ebuild b/dev-libs/nss/nss-3.11.9.ebuild index be92b3e062ee..405632f77359 100644 --- a/dev-libs/nss/nss-3.11.9.ebuild +++ b/dev-libs/nss/nss-3.11.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.9.ebuild,v 1.8 2008/04/11 17:15:38 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11.9.ebuild,v 1.9 2008/08/13 19:26:47 armin76 Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -20,17 +20,21 @@ DEPEND=">=dev-libs/nspr-${NSPR_VER}" src_unpack() { unpack ${A} + cd "${S}"/mozilla/security/coreconf # hack nspr paths echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \ - >> "${S}"/mozilla/security/coreconf/headers.mk || die "failed to append include" + >> headers.mk || die "failed to append include" # cope with nspr being in /usr/$(get_libdir)/nspr sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \ - -i "${S}"/mozilla/security/coreconf/location.mk + -i location.mk # modify install path sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ - -i "${S}"/mozilla/security/coreconf/source.mk + -i source.mk + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk cd "${S}" epatch "${FILESDIR}"/${PN}-3.11-config.patch diff --git a/dev-libs/nss/nss-3.12.ebuild b/dev-libs/nss/nss-3.12.ebuild index 1ffb439af391..0a51dc6ff430 100644 --- a/dev-libs/nss/nss-3.12.ebuild +++ b/dev-libs/nss/nss-3.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.ebuild,v 1.1 2008/06/18 14:57:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.ebuild,v 1.2 2008/08/13 19:26:47 armin76 Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -21,17 +21,21 @@ DEPEND=">=dev-libs/nspr-${NSPR_VER} src_unpack() { unpack ${A} + cd "${S}"/mozilla/security/coreconf # hack nspr paths echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \ - >> "${S}"/mozilla/security/coreconf/headers.mk || die "failed to append include" + >> headers.mk || die "failed to append include" # cope with nspr being in /usr/$(get_libdir)/nspr sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \ - -i "${S}"/mozilla/security/coreconf/location.mk + -i location.mk # modify install path sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ - -i "${S}"/mozilla/security/coreconf/source.mk + -i source.mk + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk cd "${S}" epatch "${FILESDIR}"/${PN}-3.11-config.patch |