diff options
| -rw-r--r-- | sci-geosciences/googleearth/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog index 028f8e73dccc..1e143c8bb8dc 100644 --- a/sci-geosciences/googleearth/ChangeLog +++ b/sci-geosciences/googleearth/ChangeLog @@ -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) diff --git a/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild b/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild index bffd2e5d4b63..ce271f58bc46 100644 --- a/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild +++ b/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild @@ -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 @@ src_prepare() { # 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() { |