diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-07-05 17:36:38 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-07-05 17:36:38 +0000 |
| commit | d935355c33b5a5f1e38abc13f819f978e4a480ec (patch) | |
| tree | 7eca1ab28fcae9fbdc403dd195a77a6dc6361d0d | |
| parent | old (diff) | |
| download | gentoo-2-d935355c33b5a5f1e38abc13f819f978e4a480ec.tar.gz gentoo-2-d935355c33b5a5f1e38abc13f819f978e4a480ec.tar.bz2 gentoo-2-d935355c33b5a5f1e38abc13f819f978e4a480ec.zip | |
Switch from gen_usr_ldscript to the root_libdir that the package supports #276465 by Yury Vorobyov.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
| -rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.41.7-r1.ebuild | 16 |
2 files changed, 14 insertions, 9 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index 0542ea75ad54..4507cedd8f69 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,11 @@ # 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.191 2009/07/03 19:35:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.192 2009/07/05 17:36:38 vapier Exp $ + + 05 Jul 2009; Mike Frysinger <vapier@gentoo.org> + e2fsprogs-1.41.7-r1.ebuild: + Switch from gen_usr_ldscript to the root_libdir that the package supports + #276465 by Yury Vorobyov. *e2fsprogs-1.41.7-r1 (03 Jul 2009) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.7-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.7-r1.ebuild index 615bc2a4ace1..558920c4e53d 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.41.7-r1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.7-r1.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.7-r1.ebuild,v 1.1 2009/07/03 19:35:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.7-r1.ebuild,v 1.2 2009/07/05 17:36:38 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -111,15 +111,15 @@ pkg_preinst() { } src_install() { - emake STRIP=: DESTDIR="${D}" install install-libs || die + # need to set root_libdir= manually as any --libdir options in the + # econf above (i.e. multilib) will screw up the default #276465 + emake \ + STRIP=: \ + root_libdir="/$(get_libdir)" \ + DESTDIR="${D}" \ + install install-libs || die dodoc README RELEASE-NOTES - # Move shared libraries to /lib/, install static libraries to /usr/lib/, - # and install linker scripts to /usr/lib/. - set -- "${D}"/usr/$(get_libdir)/*.a - set -- ${@/*\/lib} - gen_usr_ldscript -a "${@/.a}" - if use elibc_FreeBSD ; then # Install helpers for us into / |