diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-09-02 21:12:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-09-02 21:12:15 +0000 |
| commit | 5d93b2ea6a39de21b5970e4aeb9c928c864a197e (patch) | |
| tree | 0af1cff48fd4cdf45abe008f910c002a3e9262b8 | |
| parent | media-gfx/gimp: Add myself as a backup maintainer (diff) | |
| download | gentoo-2-5d93b2ea6a39de21b5970e4aeb9c928c864a197e.tar.gz gentoo-2-5d93b2ea6a39de21b5970e4aeb9c928c864a197e.tar.bz2 gentoo-2-5d93b2ea6a39de21b5970e4aeb9c928c864a197e.zip | |
Fix broken USE=static handling and respect env CPPFLAGS.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
| -rw-r--r-- | app-arch/pbzip2/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch | 4 | ||||
| -rw-r--r-- | app-arch/pbzip2/pbzip2-1.1.5.ebuild | 25 |
3 files changed, 16 insertions, 19 deletions
diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog index 4693041b00f8..c371a0718584 100644 --- a/app-arch/pbzip2/ChangeLog +++ b/app-arch/pbzip2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/pbzip2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.96 2011/08/02 19:17:04 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.97 2011/09/02 21:12:15 vapier Exp $ + + 02 Sep 2011; Mike Frysinger <vapier@gentoo.org> + files/pbzip2-1.1.2-makefile.patch, pbzip2-1.1.5.ebuild: + Fix broken USE=static handling and respect env CPPFLAGS. *pbzip2-1.1.5 (02 Aug 2011) diff --git a/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch b/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch index 2457f0197be7..cc4cb2b15b72 100644 --- a/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch +++ b/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch @@ -51,12 +51,12 @@ # Standard pbzip2 compile pbzip2: pbzip2.cpp BZ2StreamScanner.cpp - $(CC) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 # Choose this if you want to compile in a static version of the libbz2 library pbzip2-static: pbzip2.cpp BZ2StreamScanner.cpp libbz2.a - $(CC) $(CFLAGS) $^ -o pbzip2 -I. -L. $(LDFLAGS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 -I. -L. ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 -I. -L. # Install the binary pbzip2 program and man page install: pbzip2 diff --git a/app-arch/pbzip2/pbzip2-1.1.5.ebuild b/app-arch/pbzip2/pbzip2-1.1.5.ebuild index ae846a1dd127..5c6c5ef17958 100644 --- a/app-arch/pbzip2/pbzip2-1.1.5.ebuild +++ b/app-arch/pbzip2/pbzip2-1.1.5.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v 1.1 2011/08/02 19:17:04 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v 1.2 2011/09/02 21:12:15 vapier Exp $ EAPI=4 -inherit multilib eutils +inherit flag-o-matic eutils DESCRIPTION="Parallel bzip2 (de)compressor using libbz2" HOMEPAGE="http://compression.ca/pbzip2/" @@ -21,26 +21,19 @@ RDEPEND="${DEPEND}" src_prepare() { epatch "${FILESDIR}"/${PN}-1.1.2-makefile.patch tc-export CXX -} - -src_compile() { - if use static ; then - cp -f /usr/$(get_libdir)/libbz2.a "${S}" - emake pbzip2-static || die "Failed to build" - else - emake pbzip2 || die "Failed to build" - fi + use static && append-ldflags -static } src_install() { dobin pbzip2 || die "Failed to install" dodoc AUTHORS ChangeLog README || die doman pbzip2.1 || die "Failed to install man page" - dosym /usr/bin/pbzip2 /usr/bin/pbunzip2 + dosym pbzip2 /usr/bin/pbunzip2 - if use symlink; then - dosym /usr/bin/pbzip2 /usr/bin/bzip2 - dosym /usr/bin/pbzip2 /usr/bin/bunzip2 - dosym /usr/bin/pbzip2 /usr/bin/bzcat + if use symlink ; then + local s + for s in bzip2 bunzip2 bzcat ; do + dosym pbzip2 /usr/bin/${s} || die + done fi } |