diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2009-03-20 20:00:23 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2009-03-20 20:00:23 +0000 |
| commit | 42a0b98a03fd4a27df2fbfc422b2e1d12a4c3bcd (patch) | |
| tree | 9aafdab5b96a248c7bfd3fab6513936e1f3da9b8 /app-arch | |
| parent | Marked ~ppc/~ppc64 for bug #258616. (diff) | |
| download | gentoo-2-42a0b98a03fd4a27df2fbfc422b2e1d12a4c3bcd.tar.gz gentoo-2-42a0b98a03fd4a27df2fbfc422b2e1d12a4c3bcd.tar.bz2 gentoo-2-42a0b98a03fd4a27df2fbfc422b2e1d12a4c3bcd.zip | |
Respect LDFLAGS (bug #263121).
(Portage version: 2.2_rc26/cvs/Linux i686)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/pbzip2/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/pbzip2/files/pbzip2-1.0.5-ldflags.patch | 16 | ||||
| -rw-r--r-- | app-arch/pbzip2/pbzip2-1.0.5-r1.ebuild | 40 |
3 files changed, 63 insertions, 1 deletions
diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog index 516797f1f952..84723bebc115 100644 --- a/app-arch/pbzip2/ChangeLog +++ b/app-arch/pbzip2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-arch/pbzip2 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.63 2009/03/18 14:38:46 ricmm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.64 2009/03/20 20:00:23 jer Exp $ + +*pbzip2-1.0.5-r1 (20 Mar 2009) + + 20 Mar 2009; Jeroen Roovers <jer@gentoo.org> + +files/pbzip2-1.0.5-ldflags.patch, +pbzip2-1.0.5-r1.ebuild: + Respect LDFLAGS (bug #263121). 18 Mar 2009; <ricmm@gentoo.org> pbzip2-1.0.1.ebuild: Drop down to ~mips due to unstable deps diff --git a/app-arch/pbzip2/files/pbzip2-1.0.5-ldflags.patch b/app-arch/pbzip2/files/pbzip2-1.0.5-ldflags.patch new file mode 100644 index 000000000000..3042b30ea275 --- /dev/null +++ b/app-arch/pbzip2/files/pbzip2-1.0.5-ldflags.patch @@ -0,0 +1,16 @@ +--- pbzip2-1.0.5/Makefile.orig 2009-03-20 20:52:48.000000000 +0100 ++++ pbzip2-1.0.5/Makefile 2009-03-20 20:54:30.000000000 +0100 +@@ -21,11 +21,11 @@ + + # Standard pbzip2 compile + pbzip2: pbzip2.cpp +- $(CC) $(CFLAGS) $^ -o pbzip2 -pthread -lpthread -lbz2 ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o pbzip2 -pthread -lpthread -lbz2 + + # Choose this if you want to compile in a static version of the libbz2 library + pbzip2-static: pbzip2.cpp libbz2.a +- $(CC) $(CFLAGS) $^ -o pbzip2 -pthread -lpthread -I. -L. -lbz2 ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o pbzip2 -pthread -lpthread -I. -L. -lbz2 + + # Install the binary pbzip2 program and man page + install: pbzip2 diff --git a/app-arch/pbzip2/pbzip2-1.0.5-r1.ebuild b/app-arch/pbzip2/pbzip2-1.0.5-r1.ebuild new file mode 100644 index 000000000000..f029dea056ff --- /dev/null +++ b/app-arch/pbzip2/pbzip2-1.0.5-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.0.5-r1.ebuild,v 1.1 2009/03/20 20:00:23 jer Exp $ + +inherit multilib eutils + +DESCRIPTION="parallel bzip2 (de)compressor using libbz2" +HOMEPAGE="http://compression.ca/pbzip2/" +SRC_URI="http://compression.ca/${PN}/${P}.tar.gz" + +LICENSE="PBZIP2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="static" + +DEPEND="app-arch/bzip2" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack ${A} + sed -e 's:^CFLAGS = .*$:#&:g' -e 's:g++:$(CXX):g' -i ${P}/Makefile || die + epatch "${FILESDIR}"/${P}-ldflags.patch +} + +src_compile() { + tc-export CXX + 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 +} + +src_install() { + dobin pbzip2 || die "Failed to install" + dodoc AUTHORS ChangeLog README + doman pbzip2.1 || die "Failed to install man page" + dosym /usr/bin/pbzip2 /usr/bin/pbunzip2 +} |