diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-10-11 14:27:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-11 14:27:27 +0000 |
| commit | 6ced6a1b46503bca4ce2ccc55d9d017691a4fdd6 (patch) | |
| tree | caaef9d1f1e006d593752a156c803a6079e4cf86 /app-backup | |
| parent | Stable channel bump. (diff) | |
| download | gentoo-2-6ced6a1b46503bca4ce2ccc55d9d017691a4fdd6.tar.gz gentoo-2-6ced6a1b46503bca4ce2ccc55d9d017691a4fdd6.tar.bz2 gentoo-2-6ced6a1b46503bca4ce2ccc55d9d017691a4fdd6.zip | |
Use patchelf --set-rpath so that library dependencies can be properly
tracked for preserve-libs as discussed in bug #400979. We can backport this to
older ebuilds after it gets some testing.
(Portage version: 2.2.0_alpha137/cvs/Linux i686)
Diffstat (limited to 'app-backup')
| -rw-r--r-- | app-backup/spideroak-bin/ChangeLog | 7 | ||||
| -rw-r--r-- | app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild | 14 |
2 files changed, 18 insertions, 3 deletions
diff --git a/app-backup/spideroak-bin/ChangeLog b/app-backup/spideroak-bin/ChangeLog index 594a9cba4a3c..04c136d928da 100644 --- a/app-backup/spideroak-bin/ChangeLog +++ b/app-backup/spideroak-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-backup/spideroak-bin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/ChangeLog,v 1.27 2012/10/10 00:14:57 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/ChangeLog,v 1.28 2012/10/11 14:27:27 zmedico Exp $ + + 11 Oct 2012; Zac Medico <zmedico@gentoo.org> spideroak-bin-4.7.9948.ebuild: + Use patchelf --set-rpath so that library dependencies can be properly tracked + for preserve-libs as discussed in bug #400979. We can backport this to older + ebuilds after it gets some testing. 10 Oct 2012; <naota@gentoo.org> metadata.xml: Drop myself from maintainer. I nolonger use it and blueness is handling bugs. diff --git a/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild index bafaaea55842..6bbd358a219f 100644 --- a/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild +++ b/app-backup/spideroak-bin/spideroak-bin-4.7.9948.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/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild,v 1.2 2012/08/27 01:46:36 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild,v 1.3 2012/10/11 14:27:27 zmedico Exp $ EAPI="4" @@ -22,7 +22,7 @@ IUSE="dbus headless system-libs" SSL_SLOT="0.9.8" -DEPEND="" +DEPEND="dev-util/patchelf" RDEPEND=" dbus? ( sys-apps/dbus ) !headless? ( @@ -113,6 +113,16 @@ src_prepare() { # Remove bundled python interpreter => dev-lang/python:2.7 rm usr/lib/SpiderOak/py || die "rm py failed" fi + + # Set RPATH for preserve-libs handling (bug #400979). + cd "${S}/usr/lib/SpiderOak" || die + 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() { |