diff options
| author |   Danny van Dyk <kugelfang@gentoo.org> | 2005-03-31 15:52:22 +0000 |
|---|---|---|
| committer | Danny van Dyk <kugelfang@gentoo.org> | 2005-03-31 15:52:22 +0000 |
| commit | f383f37bd9fec18b23acbe371f01e18cf8ce6ea0 (patch) | |
| tree | 2dd6a168a3cac487bd6b5468b98ebdc637fa4e76 /app-arch/bzip2 | |
| parent | Changed the profile's README to reflect status change to 'stable'. (diff) | |
| download | gentoo-2-f383f37bd9fec18b23acbe371f01e18cf8ce6ea0.tar.gz gentoo-2-f383f37bd9fec18b23acbe371f01e18cf8ce6ea0.tar.bz2 gentoo-2-f383f37bd9fec18b23acbe371f01e18cf8ce6ea0.zip | |
Fixed BUG #87280 (multilib-strict).
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-arch/bzip2')
| -rw-r--r-- | app-arch/bzip2/ChangeLog | 5 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.2-r5.ebuild | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog index 5c83b6f4d1dd..280fd355c60c 100644 --- a/app-arch/bzip2/ChangeLog +++ b/app-arch/bzip2/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-arch/bzip2 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.20 2005/02/19 18:30:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.21 2005/03/31 15:52:22 kugelfang Exp $ + + 31 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> bzip2-1.0.2-r5.ebuild: + Fixed BUG #87280 (multilib-strict). *bzip2-1.0.2-r5 (19 Feb 2005) diff --git a/app-arch/bzip2/bzip2-1.0.2-r5.ebuild b/app-arch/bzip2/bzip2-1.0.2-r5.ebuild index 2a44e0d0b0d3..e00a58a90ba9 100644 --- a/app-arch/bzip2/bzip2-1.0.2-r5.ebuild +++ b/app-arch/bzip2/bzip2-1.0.2-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r5.ebuild,v 1.1 2005/02/19 18:30:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r5.ebuild,v 1.2 2005/03/31 15:52:22 kugelfang Exp $ inherit toolchain-funcs flag-o-matic @@ -23,6 +23,9 @@ src_unpack() { epatch "${FILESDIR}"/${P}-saneso.patch epatch "${FILESDIR}"/${P}-progress.patch sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die + # make the Makefile multilib aware <kugelfang@gentoo.org> + sed -i -e "s:\/lib\(\ \|\/\|$\):\/$(get_libdir)\1:g" Makefile \ + || die "sed failed: get_libdir" use static && append-flags -static @@ -58,12 +61,10 @@ src_install() { fi done - [[ -z ${CONF_LIBDIR} ]] && CONF_LIBDIR="lib" - [[ ${CONF_LIBDIR} != "lib" ]] && mv ${D}/usr/lib ${D}/usr/${CONF_LIBDIR} dolib.so "${S}"/libbz2.so.${PV} - dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1.0 - dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so - dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1 + dosym libbz2.so.${PV} /usr/$(get_libdir)/libbz2.so.1.0 + dosym libbz2.so.${PV} /usr/$(get_libdir)/libbz2.so + dosym libbz2.so.${PV} /usr/$(get_libdir)/libbz2.so.1 dodoc README CHANGES Y2K_INFO docinto txt |