summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2010-01-27 02:12:00 +0000
committerJory Pratt <anarchy@gentoo.org>2010-01-27 02:12:00 +0000
commitc947486a2960e0110f353d61370053ec05e2b2c1 (patch)
tree5766a86eb56cc26e197c611f5e786e69669409a6 /dev-libs
parentensure dynamic linking is consistent for everyone (diff)
downloadhistorical-c947486a2960e0110f353d61370053ec05e2b2c1.tar.gz
historical-c947486a2960e0110f353d61370053ec05e2b2c1.tar.bz2
historical-c947486a2960e0110f353d61370053ec05e2b2c1.zip
revert dynamic linking for prefix, fixed in nspr
Package-Manager: portage-2.1.7.16/cvs/Linux x86_64
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/nss/ChangeLog5
-rw-r--r--dev-libs/nss/nss-3.12.5.ebuild7
2 files changed, 5 insertions, 7 deletions
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index f66ca1322f4f..83882d5b2854 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.166 2010/01/26 16:24:02 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.167 2010/01/27 02:12:00 anarchy Exp $
+
+ 27 Jan 2010; <anarchy@gentoo.org> nss-3.12.5.ebuild:
+ revert dynamic linking for prefix, fixed in nspr
26 Jan 2010; Jeremy Olexa <darkside@gentoo.org> nss-3.12.5.ebuild:
Fix dynamic linking issues which surfaced in Gentoo Prefix env. Tested on
diff --git a/dev-libs/nss/nss-3.12.5.ebuild b/dev-libs/nss/nss-3.12.5.ebuild
index a9781537cf2e..b8fb9c4c3f65 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.7 2010/01/26 16:20:59 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.5.ebuild,v 1.8 2010/01/27 02:12:00 anarchy Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -43,11 +43,6 @@ 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