diff options
author | 2010-01-26 16:20:59 +0000 | |
---|---|---|
committer | 2010-01-26 16:20:59 +0000 | |
commit | d389b77f4df077ddf1d2cedc179c84eddad4e226 (patch) | |
tree | 1e94489e0143ca536b63fd39c75a7e824df1c8ad /dev-libs | |
parent | amd64 stable, bug 302001 (diff) | |
download | gentoo-2-d389b77f4df077ddf1d2cedc179c84eddad4e226.tar.gz gentoo-2-d389b77f4df077ddf1d2cedc179c84eddad4e226.tar.bz2 gentoo-2-d389b77f4df077ddf1d2cedc179c84eddad4e226.zip |
Fix dynamic linking issues with surfaced in Gentoo Prefix env. Tested on Gentoo Linux system and Gentoo Prefix in bug 301649. Proxy commit approved by the mozilla team
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/nss/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/nss/nss-3.12.5.ebuild | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index 8f1a94fc74b3..d9d1fcdbfaf7 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,11 @@ # 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.164 2010/01/23 15:42:58 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.165 2010/01/26 16:20:59 darkside Exp $ + + 26 Jan 2010; Jeremy Olexa <darkside@gentoo.org> nss-3.12.5.ebuild: + Fix dynamic linking issues with surfaced in Gentoo Prefix env. Tested on + Gentoo Linux system and Gentoo Prefix in bug 301649. Proxy commit approved + by the mozilla team 23 Jan 2010; Brent Baude <ranger@gentoo.org> nss-3.12.5.ebuild: stable ppc, bug 300606 diff --git a/dev-libs/nss/nss-3.12.5.ebuild b/dev-libs/nss/nss-3.12.5.ebuild index 5b94c0f30c52..a9781537cf2e 100644 --- a/dev-libs/nss/nss-3.12.5.ebuild +++ b/dev-libs/nss/nss-3.12.5.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.ebuild,v 1.6 2010/01/23 15:42:58 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.5.ebuild,v 1.7 2010/01/26 16:20:59 darkside Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -43,6 +43,11 @@ src_unpack() { src_compile() { strip-flags + # Prefix compat. In Gentoo Linux, defaults to ${ROOT} (can be changed with + # EAPI-3). bug 301649 + [[ -z ${EROOT} ]] && local EROOT=${ROOT} + append-ldflags -Wl,-R,"${EROOT}"/usr/$(get_libdir)/nspr + echo > "${T}"/test.c $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o case $(file "${T}"/test.o) in |