summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/bzip2/ChangeLog6
-rw-r--r--sys-apps/bzip2/bzip2-1.0.2-r2.ebuild8
2 files changed, 9 insertions, 5 deletions
diff --git a/sys-apps/bzip2/ChangeLog b/sys-apps/bzip2/ChangeLog
index f2c33b21fca8..b1dd9fa55be4 100644
--- a/sys-apps/bzip2/ChangeLog
+++ b/sys-apps/bzip2/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for sys-apps/bzip2
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/ChangeLog,v 1.15 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/ChangeLog,v 1.16 2003/03/01 20:15:08 lostlogic Exp $
20 Feb 2003; Zach Welch <zwelch@gentoo.org> bzip2-1.0.2-r2.ebuild :
Added arm to keywords.
@@ -15,6 +15,10 @@
*bzip2-1.0.2-r2 (29 Jun 2002)
+ 01 Mar 2003; Brandon Low <lostlogic@gentoo.org> bzip2-1.0.2-r2.ebuild:
+ Various ebuild fixes, better errors, use of einstall, and make the package use
+ the proper CC and CXXs from the portage environment
+
07 Feb 2003; Brandon Low <lostlogic@gentoo.org> :
Fix breakage when features=distcc is enabled. this seems to be
an issue with the way that make is parsing options such as
diff --git a/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild b/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild
index 6c3c5b2796fa..8a39dc89c2ef 100644
--- a/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild
+++ b/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild,v 1.19 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/bzip2-1.0.2-r2.ebuild,v 1.20 2003/03/01 20:15:08 lostlogic Exp $
S=${WORKDIR}/${P}
DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
@@ -32,15 +32,15 @@ src_unpack() {
src_compile() {
if [ -z "`use build`" ]
then
- emake -f Makefile-libbz2_so all || die
+ emake CC="${CC}" CXX="${CXX}" -f Makefile-libbz2_so all || die "Make failed"
fi
- emake all || die
+ emake CC="${CC}" CXX="${CXX}" all || die "Make failed"
}
src_install() {
if [ -z "`use build`" ]
then
- make PREFIX=${D}/usr install || die
+ einstall DESTDIR="${D}" || die
mv ${D}/usr/bin ${D}
dolib.so ${S}/libbz2.so.${PV}