summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2010-01-26 16:20:59 +0000
committerJeremy Olexa <darkside@gentoo.org>2010-01-26 16:20:59 +0000
commit45c8f9be33b5fc76b51861b2ca8719e9818acd26 (patch)
tree5faf46ed3ca6a5c7db84c83aee329f94061bc037 /dev-libs/nss
parentamd64 stable, bug 302001 (diff)
downloadhistorical-45c8f9be33b5fc76b51861b2ca8719e9818acd26.tar.gz
historical-45c8f9be33b5fc76b51861b2ca8719e9818acd26.tar.bz2
historical-45c8f9be33b5fc76b51861b2ca8719e9818acd26.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
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/nss')
-rw-r--r--dev-libs/nss/ChangeLog7
-rw-r--r--dev-libs/nss/Manifest4
-rw-r--r--dev-libs/nss/nss-3.12.5.ebuild7
3 files changed, 14 insertions, 4 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/Manifest b/dev-libs/nss/Manifest
index 66d53c4260b9..5fc6a26b7d08 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -23,6 +23,6 @@ EBUILD nss-3.12.2.ebuild 4598 RMD160 bfe76dcbb0bbc33aad9462384217cc8a3b0e2402 SH
EBUILD nss-3.12.3-r1.ebuild 4707 RMD160 a0152ef25c60c1a84f38c4d79589a007c9584a7e SHA1 0d705e3db8f9fea9b04fb912e8d6eded40496693 SHA256 577f4d89c6d0fc7c2ff9bacce97b4658e681ac3f7f269f4eed4a2a65e976e927
EBUILD nss-3.12.3.ebuild 4613 RMD160 440ac301ddf48df2e715ea7c59d30b8f9cc658fc SHA1 88c7c9f9c821d9df2ae8ab0497adfa6f3c4b9195 SHA256 7e1430b5c050da8b83aad62209a5fc0a7262676f8adf38f00d8a92123cedb9ce
EBUILD nss-3.12.4-r2.ebuild 3797 RMD160 f9cc7d27298f953b5d70551c199432e48d933e5d SHA1 418b773d837571db4918cbbba8b5f43216b8db3f SHA256 cddf7ceebbd2077a5e1245d23db28a92c8ff3e7cb17eb0e3f148e0ad03e2df12
-EBUILD nss-3.12.5.ebuild 3909 RMD160 e34af14fbfbe15c6296b0cd54290d589d55a784b SHA1 40dc50f83c6e0efe65b38c36c4fa5b7845320dab SHA256 5635827d642a75bb975a37ea4b01330e6d64b63948235bd0348135c266366ff9
-MISC ChangeLog 20450 RMD160 600a39fe000f461988f7b8f147d884cdfc34dfb0 SHA1 d0c692a1e7bf5824c45239917e246ab2ac3de14e SHA256 5f8f01d283b2909cbb58c9fd9d713ed20fda6511b7d8393bb466fa10772b7e45
+EBUILD nss-3.12.5.ebuild 4110 RMD160 473dbd67b8c47f0fcf8d29b7b35bd97621c68192 SHA1 9f37bb556686b66cd479b4e58ae59e6ce3226608 SHA256 27f048501cfcbf33e04605b3bc8dad9ab2fe9a3c61ccce50af07a5a54ef26829
+MISC ChangeLog 20696 RMD160 1f667b57161ad6c5133201e85e35614c97f76cb8 SHA1 c64fa241cf66bc983b22551e80175ad1d8eadf01 SHA256 360f90badbf309f42191cab5043f34e96047b58834b781ba2b904ad8840417af
MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
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