diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-05-08 08:50:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-08 08:50:24 +0000 |
| commit | 0d1a776fe81519ebccd83fb0f2be314e55ffccde (patch) | |
| tree | 4924310c861c516c5229f7cd22ee3fdf2410ebb6 /sci-geosciences/googleearth | |
| parent | Remove old version. (diff) | |
| download | historical-0d1a776fe81519ebccd83fb0f2be314e55ffccde.tar.gz historical-0d1a776fe81519ebccd83fb0f2be314e55ffccde.tar.bz2 historical-0d1a776fe81519ebccd83fb0f2be314e55ffccde.zip | |
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.
Package-Manager: portage-2.2.0_alpha101_p18/cvs/Linux i686
Diffstat (limited to 'sci-geosciences/googleearth')
| -rw-r--r-- | sci-geosciences/googleearth/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-geosciences/googleearth/Manifest | 14 | ||||
| -rw-r--r-- | sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild | 11 |
3 files changed, 23 insertions, 9 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/Manifest b/sci-geosciences/googleearth/Manifest index 73e58a5f3108..0a9799e3a4b4 100644 --- a/sci-geosciences/googleearth/Manifest +++ b/sci-geosciences/googleearth/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX decimal-separator.patch 324 RMD160 88c5c41517d4195a1f6ad03f58762021fe9ff255 SHA1 82b6920a3ac9ffd4481fe31f60bc72e22e0d4093 SHA256 5c1ffe3cb7b7328245d92c627f8b8d963a9a2aab67c70b5387b151f78b04c051 AUX googleearth-mimetypes.xml 638 RMD160 2af02c7144488d0364d883659644281f5671e57b SHA1 b80e6e2d4f0be664cf4678d9ad92a74a58ce0b2e SHA256 71e57a7370dc2c0eb6b85e2bbb5282ed7a7542e58f849a20282b1627cef9b2b9 @@ -14,13 +14,13 @@ EBUILD googleearth-5.1.3535.3218-r1.ebuild 4326 RMD160 83a04fbe9bb9b611ff6824197 EBUILD googleearth-5.2.1.1588.ebuild 5040 RMD160 32e94e8f6341816758a1bccf46d33862594ee3d3 SHA1 bf5e834dcc573859a4076d5fab5c7e283487d961 SHA256 a81ae8f81789d9415279eef67cfd89cff543a93fdf96bd20fa087d1ad37c1ca5 EBUILD googleearth-6.0.2.2074.ebuild 5582 RMD160 cacbb1e42d0e4df6179f167aae17f36ed849bcd2 SHA1 fabab63df9aabd342cecc2a2ebed7e2a2e2b2ab1 SHA256 04b55a843f80d625120689598f95ff7f9ee7260f0b61d3055b3391b2602709f8 EBUILD googleearth-6.0.3.2197.ebuild 5302 RMD160 928cb43e0fec5991b2dd4b2d6e3a7c1e66ba7417 SHA1 18e33e0e39cbeda748041feb70e60142e3cd4c77 SHA256 b2025b02d47bac34b7d96c8a7b3216be9d5af8b48dcb762e6c081d6b2f425ea0 -EBUILD googleearth-6.2.2.6613.ebuild 5253 RMD160 ab01dbaff058899b2ce8e3478f63d9482c7d51a7 SHA1 4a70ba8cd10d450fbc298ddb3e2bf57e81d9aef7 SHA256 1fb9a7bce973c3c90450d98f0a32e1ff505bb124c3353676a2c9d80ba62ff52d -MISC ChangeLog 17710 RMD160 452ce2b84cd5c97a348cf323599f228e4842bd62 SHA1 17476e483ec0cd32d81d7692f6f03ce5d1273ce7 SHA256 dfaf124159453a28dc833ba80d86425951262ea6738e5944803144d286e4ef0f +EBUILD googleearth-6.2.2.6613.ebuild 5562 RMD160 f51e0ad832a13ba4d94901ae3d972aaf9a532630 SHA1 79f497ede1d63263765b2186bd0cc95bac4d1331 SHA256 edd64f2e06deb6a66465e844198cdb663359e010b513b14b6981a4b9a568b203 +MISC ChangeLog 17998 RMD160 1f3d4643f06498058e2c09ee9a868ebb5909cf73 SHA1 85e758374b9557408e7ea594ffb189860d399191 SHA256 4a7ef4e19e6d4e49fa4b10850699ab9e8c292d43abbe902ad9d82621bd00fcbc MISC metadata.xml 592 RMD160 293f66d3138e8538252d9c542d1548305be543d7 SHA1 9c6cfc1f4066fb84dd77bc109651dc6526080ad7 SHA256 aeb2f5a091efa0e2325a89bf8501ca993ce235cb47847f3a95be339efb01bbb8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAk+lCOsACgkQknrdDGLu8JBHlAD+IHeqo4AnrCKDREauidoC2W/i -Jrf5iBJkBIIWuboHizUA/if4jRX+Kh6XlXcDIt12aEoR3/f+Fj5pV2MP64vpeSdy -=j1t7 +iEYEARECAAYFAk+o3lYACgkQ/ejvha5XGaMAzgCg1E5Bgxtj82tY35vSr9fDJo5L +Wf8AnigaApgAMctekG6Ozt4tL5NR334H +=QUSN -----END PGP SIGNATURE----- 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() { |