* [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: googleearth-6.2.2.6613.ebuild ChangeLog
@ 2012-05-08 8:50 Zac Medico (zmedico)
0 siblings, 0 replies; 3+ messages in thread
From: Zac Medico (zmedico) @ 2012-05-08 8:50 UTC (permalink / raw
To: gentoo-commits
zmedico 12/05/08 08:50:24
Modified: googleearth-6.2.2.6613.ebuild ChangeLog
Log:
Use patchelf --set-rpath $ORIGIN so that library dependencies can be properly tracked for preserve-libs as discussed in bug #265372. We can backport this to older ebuilds after it gets some testing.
(Portage version: 2.2.0_alpha101_p18/cvs/Linux i686)
Revision Changes Path
1.2 sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild?r1=1.1&r2=1.2
Index: googleearth-6.2.2.6613.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- googleearth-6.2.2.6613.ebuild 5 May 2012 11:03:09 -0000 1.1
+++ googleearth-6.2.2.6613.ebuild 8 May 2012 08:50:24 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v 1.1 2012/05/05 11:03:09 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v 1.2 2012/05/08 08:50:24 zmedico Exp $
EAPI="4"
@@ -105,6 +105,15 @@
# we have no ld-lsb.so.3 symlink
# thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
patchelf --set-interpreter /lib/ld-linux.so.2 ${PN}-bin || die "patchelf failed"
+
+ # Set RPATH for preserve-libs handling (bug #265372).
+ local x
+ for x in * ; do
+ # Use \x7fELF header to separate ELF executables and libraries
+ [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+ patchelf --set-rpath '$ORIGIN' "${x}" || \
+ die "patchelf failed on ${x}"
+ done
}
src_install() {
1.32 sci-geosciences/googleearth/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.31&r2=1.32
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog 5 May 2012 11:03:09 -0000 1.31
+++ ChangeLog 8 May 2012 08:50:24 -0000 1.32
@@ -1,6 +1,11 @@
# ChangeLog for sci-geosciences/googleearth
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.31 2012/05/05 11:03:09 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.32 2012/05/08 08:50:24 zmedico Exp $
+
+ 08 May 2012; Zac Medico <zmedico@gentoo.org> googleearth-6.2.2.6613.ebuild:
+ Use patchelf --set-rpath $ORIGIN so that library dependencies can be properly
+ tracked for preserve-libs as discussed in bug #265372. We can backport this to
+ older ebuilds after it gets some testing.
*googleearth-6.2.2.6613 (05 May 2012)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: googleearth-6.2.2.6613.ebuild ChangeLog
@ 2012-05-08 15:58 Zac Medico (zmedico)
0 siblings, 0 replies; 3+ messages in thread
From: Zac Medico (zmedico) @ 2012-05-08 15:58 UTC (permalink / raw
To: gentoo-commits
zmedico 12/05/08 15:58:35
Modified: googleearth-6.2.2.6613.ebuild ChangeLog
Log:
Also set RPATH for libraries in plugins/imageformats/ subdirectory.
(Portage version: 2.2.0_alpha101_p18/cvs/Linux i686)
Revision Changes Path
1.3 sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild?r1=1.2&r2=1.3
Index: googleearth-6.2.2.6613.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- googleearth-6.2.2.6613.ebuild 8 May 2012 08:50:24 -0000 1.2
+++ googleearth-6.2.2.6613.ebuild 8 May 2012 15:58:35 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v 1.2 2012/05/08 08:50:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v 1.3 2012/05/08 15:58:35 zmedico Exp $
EAPI="4"
@@ -114,6 +114,11 @@
patchelf --set-rpath '$ORIGIN' "${x}" || \
die "patchelf failed on ${x}"
done
+ for x in plugins/imageformats/*.so ; do
+ [[ -f ${x} ]] || continue
+ patchelf --set-rpath /opt/${PN} "${x}" || \
+ die "patchelf failed on ${x}"
+ done
}
src_install() {
1.33 sci-geosciences/googleearth/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.32&r2=1.33
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog 8 May 2012 08:50:24 -0000 1.32
+++ ChangeLog 8 May 2012 15:58:35 -0000 1.33
@@ -1,6 +1,9 @@
# ChangeLog for sci-geosciences/googleearth
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.32 2012/05/08 08:50:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.33 2012/05/08 15:58:35 zmedico Exp $
+
+ 08 May 2012; Zac Medico <zmedico@gentoo.org> googleearth-6.2.2.6613.ebuild:
+ Also set RPATH for libraries in plugins/imageformats/ subdirectory.
08 May 2012; Zac Medico <zmedico@gentoo.org> googleearth-6.2.2.6613.ebuild:
Use patchelf --set-rpath $ORIGIN so that library dependencies can be properly
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: googleearth-6.2.2.6613.ebuild ChangeLog
@ 2012-05-09 1:07 Zac Medico (zmedico)
0 siblings, 0 replies; 3+ messages in thread
From: Zac Medico (zmedico) @ 2012-05-09 1:07 UTC (permalink / raw
To: gentoo-commits
zmedico 12/05/09 01:07:18
Modified: googleearth-6.2.2.6613.ebuild ChangeLog
Log:
Use QA_PREBUILT="*" instead of RESTRICT=binchecks in order to avoid a QA Notice with latest portage.
(Portage version: 2.2.0_alpha102/cvs/Linux i686)
Revision Changes Path
1.4 sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild?r1=1.3&r2=1.4
Index: googleearth-6.2.2.6613.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- googleearth-6.2.2.6613.ebuild 8 May 2012 15:58:35 -0000 1.3
+++ googleearth-6.2.2.6613.ebuild 9 May 2012 01:07:18 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v 1.3 2012/05/08 15:58:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v 1.4 2012/05/09 01:07:18 zmedico Exp $
EAPI="4"
@@ -17,10 +17,11 @@
LICENSE="googleearth GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RESTRICT="binchecks mirror strip"
+RESTRICT="mirror strip"
IUSE="mdns-bundled +qt-bundled"
GCC_NEEDED="4.2"
+QA_PREBUILT="*"
RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-nocxx] )
x86? (
1.34 sci-geosciences/googleearth/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.33&r2=1.34
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog 8 May 2012 15:58:35 -0000 1.33
+++ ChangeLog 9 May 2012 01:07:18 -0000 1.34
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/googleearth
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.33 2012/05/08 15:58:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.34 2012/05/09 01:07:18 zmedico Exp $
+
+ 09 May 2012; Zac Medico <zmedico@gentoo.org> googleearth-6.2.2.6613.ebuild:
+ Use QA_PREBUILT="*" instead of RESTRICT=binchecks in order to avoid a QA
+ Notice with latest portage.
08 May 2012; Zac Medico <zmedico@gentoo.org> googleearth-6.2.2.6613.ebuild:
Also set RPATH for libraries in plugins/imageformats/ subdirectory.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-09 1:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-08 8:50 [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: googleearth-6.2.2.6613.ebuild ChangeLog Zac Medico (zmedico)
-- strict thread matches above, loose matches on Subject: below --
2012-05-08 15:58 Zac Medico (zmedico)
2012-05-09 1:07 Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox