diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-14 17:36:14 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-14 17:36:14 +0000 |
| commit | 4c95d59516e7ea984a1ae3bb84ec46d4571c9662 (patch) | |
| tree | 886012820dc7806590e18352bf8c7bb2b2fd388c /app-arch/bzip2 | |
| parent | gcc4 compile fix; bug #91924 (diff) | |
| download | gentoo-2-4c95d59516e7ea984a1ae3bb84ec46d4571c9662.tar.gz gentoo-2-4c95d59516e7ea984a1ae3bb84ec46d4571c9662.tar.bz2 gentoo-2-4c95d59516e7ea984a1ae3bb84ec46d4571c9662.zip | |
Fix USE=static handling #92557 by Alexander Skwar.
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'app-arch/bzip2')
| -rw-r--r-- | app-arch/bzip2/ChangeLog | 10 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.3-r2.ebuild (renamed from app-arch/bzip2/bzip2-1.0.3-r1.ebuild) | 9 | ||||
| -rw-r--r-- | app-arch/bzip2/files/digest-bzip2-1.0.3-r2 (renamed from app-arch/bzip2/files/digest-bzip2-1.0.3-r1) | 0 |
3 files changed, 13 insertions, 6 deletions
diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog index ff173f37c9ab..5b890c678c57 100644 --- a/app-arch/bzip2/ChangeLog +++ b/app-arch/bzip2/ChangeLog @@ -1,6 +1,12 @@ # 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.23 2005/05/13 02:25:39 vapier Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.24 2005/05/14 17:36:14 vapier Exp $ + +*bzip2-1.0.3-r2 (14 May 2005) + + 14 May 2005; Mike Frysinger <vapier@gentoo.org> -bzip2-1.0.3-r1.ebuild, + +bzip2-1.0.3-r2.ebuild: + Fix USE=static handling #92557 by Alexander Skwar. *bzip2-1.0.3-r1 (13 May 2005) diff --git a/app-arch/bzip2/bzip2-1.0.3-r1.ebuild b/app-arch/bzip2/bzip2-1.0.3-r2.ebuild index 2b446e667679..17091542482a 100644 --- a/app-arch/bzip2/bzip2-1.0.3-r1.ebuild +++ b/app-arch/bzip2/bzip2-1.0.3-r2.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.3-r1.ebuild,v 1.1 2005/05/13 02:25:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.3-r2.ebuild,v 1.1 2005/05/14 17:36:14 vapier Exp $ inherit multilib toolchain-funcs flag-o-matic @@ -24,8 +24,6 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-1.0.2-progress.patch sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die "sed manpath" - use static && append-flags -static - # - Generate symlinks instead of hardlinks # - pass custom variables to control libdir sed -i \ @@ -49,6 +47,7 @@ src_compile() { if ! use build ; then emake ${makeopts} -f Makefile-libbz2_so all || die "Make failed libbz2" fi + use static && append-flags -static emake ${makeopts} all || die "Make failed" } @@ -59,7 +58,9 @@ src_install() { # move bzip2 binaries to / and use the shared libbz2.so mv "${D}"/usr/bin "${D}"/ into / - newbin bzip2-shared bzip2 || die "dobin shared" + if ! use static ; then + newbin bzip2-shared bzip2 || die "dobin shared" + fi dolib.so "${S}"/libbz2.so.${PV} || die "dolib shared" for v in ${PV%%.*} ${PV%.*} ; do dosym libbz2.so.${PV} /$(get_libdir)/libbz2.so.${v} diff --git a/app-arch/bzip2/files/digest-bzip2-1.0.3-r1 b/app-arch/bzip2/files/digest-bzip2-1.0.3-r2 index 24bf9c7e285a..24bf9c7e285a 100644 --- a/app-arch/bzip2/files/digest-bzip2-1.0.3-r1 +++ b/app-arch/bzip2/files/digest-bzip2-1.0.3-r2 |