| 1 |
darkside 10/01/26 16:20:59 |
| 2 |
|
| 3 |
Modified: ChangeLog nss-3.12.5.ebuild |
| 4 |
Log: |
| 5 |
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 |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.165 dev-libs/nss/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.165&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.165&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?r1=1.164&r2=1.165 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v |
| 18 |
retrieving revision 1.164 |
| 19 |
retrieving revision 1.165 |
| 20 |
diff -u -r1.164 -r1.165 |
| 21 |
--- ChangeLog 23 Jan 2010 15:42:58 -0000 1.164 |
| 22 |
+++ ChangeLog 26 Jan 2010 16:20:59 -0000 1.165 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for dev-libs/nss |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.164 2010/01/23 15:42:58 ranger Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.165 2010/01/26 16:20:59 darkside Exp $ |
| 28 |
+ |
| 29 |
+ 26 Jan 2010; Jeremy Olexa <darkside@g.o> nss-3.12.5.ebuild: |
| 30 |
+ Fix dynamic linking issues with surfaced in Gentoo Prefix env. Tested on |
| 31 |
+ Gentoo Linux system and Gentoo Prefix in bug 301649. Proxy commit approved |
| 32 |
+ by the mozilla team |
| 33 |
|
| 34 |
23 Jan 2010; Brent Baude <ranger@g.o> nss-3.12.5.ebuild: |
| 35 |
stable ppc, bug 300606 |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.7 dev-libs/nss/nss-3.12.5.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.5.ebuild?rev=1.7&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.5.ebuild?rev=1.7&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.5.ebuild?r1=1.6&r2=1.7 |
| 44 |
|
| 45 |
Index: nss-3.12.5.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.5.ebuild,v |
| 48 |
retrieving revision 1.6 |
| 49 |
retrieving revision 1.7 |
| 50 |
diff -u -r1.6 -r1.7 |
| 51 |
--- nss-3.12.5.ebuild 23 Jan 2010 15:42:58 -0000 1.6 |
| 52 |
+++ nss-3.12.5.ebuild 26 Jan 2010 16:20:59 -0000 1.7 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.5.ebuild,v 1.6 2010/01/23 15:42:58 ranger Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.5.ebuild,v 1.7 2010/01/26 16:20:59 darkside Exp $ |
| 58 |
|
| 59 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 60 |
|
| 61 |
@@ -43,6 +43,11 @@ |
| 62 |
src_compile() { |
| 63 |
strip-flags |
| 64 |
|
| 65 |
+ # Prefix compat. In Gentoo Linux, defaults to ${ROOT} (can be changed with |
| 66 |
+ # EAPI-3). bug 301649 |
| 67 |
+ [[ -z ${EROOT} ]] && local EROOT=${ROOT} |
| 68 |
+ append-ldflags -Wl,-R,"${EROOT}"/usr/$(get_libdir)/nspr |
| 69 |
+ |
| 70 |
echo > "${T}"/test.c |
| 71 |
$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o |
| 72 |
case $(file "${T}"/test.o) in |
Archives