diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-07-20 04:19:47 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-07-20 04:19:47 +0000 |
| commit | ac21e4f8be57a55497d09453401145fe83b7fcfa (patch) | |
| tree | bb87fe96109005ccfbddb6b18c1438736054fdb8 /sys-fs | |
| parent | amd64 stable, bug 275673 (diff) | |
| download | gentoo-2-ac21e4f8be57a55497d09453401145fe83b7fcfa.tar.gz gentoo-2-ac21e4f8be57a55497d09453401145fe83b7fcfa.tar.bz2 gentoo-2-ac21e4f8be57a55497d09453401145fe83b7fcfa.zip | |
Convert absolute lib symlinks to relative ones #278365 by Artjom Simon.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild | 23 |
2 files changed, 17 insertions, 11 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index 1a54da6494ea..3c8d09be027c 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/e2fsprogs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.193 2009/07/16 03:12:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.194 2009/07/20 04:19:47 vapier Exp $ + + 20 Jul 2009; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.41.8.ebuild: + Convert absolute lib symlinks to relative ones #278365 by Artjom Simon. *e2fsprogs-1.41.8 (16 Jul 2009) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild index 187c9b443eb5..32349d13e30c 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild,v 1.3 2009/07/19 17:57:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild,v 1.4 2009/07/20 04:19:47 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -115,8 +115,15 @@ src_install() { install install-libs || die dodoc README RELEASE-NOTES - # deploy linker scripts rather than abs symlinks for cross-compiling - gen_usr_ldscript -a e2p ext2fs + # make sure symlinks are relative, not absolute, for cross-compiling + cd "${D}"/usr/$(get_libdir) + local x l + for x in lib* ; do + l=$(readlink "${x}") + [[ ${l} == /* ]] || continue + rm -f "${x}" + ln -s "../..${l}" "${x}" + done if use elibc_FreeBSD ; then # Install helpers for us @@ -124,13 +131,9 @@ src_install() { dosbin "${S}"/fsck_ext2fs || die doman "${FILESDIR}"/fsck_ext2fs.8 - # these manpages are already provided by FreeBSD libc - # and filefrag is linux only - rm -f \ + # filefrag is linux only + rm \ "${D}"/usr/sbin/filefrag \ - "${D}"/usr/share/man/man8/filefrag.8 \ - "${D}"/usr/bin/uuidgen \ - "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ - "${D}"/usr/share/man/man1/uuidgen.1 || die + "${D}"/usr/share/man/man8/filefrag.8 || die fi } |