diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2008-11-17 07:21:43 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2008-11-17 07:21:43 +0000 |
| commit | 80b1efa9beedf47d456114d6e252db790d3c466d (patch) | |
| tree | 2972710940645e4eea56c57fc46119f81c0b810d /app-arch | |
| parent | Stable for HPPA (bug #247089). (diff) | |
| download | gentoo-2-80b1efa9beedf47d456114d6e252db790d3c466d.tar.gz gentoo-2-80b1efa9beedf47d456114d6e252db790d3c466d.tar.bz2 gentoo-2-80b1efa9beedf47d456114d6e252db790d3c466d.zip | |
Patch for uclibc support (no getloadavg, bug #246810). Let make pick up CFLAGS from environment. Use canonical CXX.
(Portage version: 2.2_rc14/cvs/Linux 2.6.25-gentoo-r7-JeR i686)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/pbzip2/ChangeLog | 7 | ||||
| -rw-r--r-- | app-arch/pbzip2/files/pbzip2-1.0.2-uclibc.patch | 24 | ||||
| -rw-r--r-- | app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild | 8 |
3 files changed, 35 insertions, 4 deletions
diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog index 31e33539d40e..e479ecef3e32 100644 --- a/app-arch/pbzip2/ChangeLog +++ b/app-arch/pbzip2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/pbzip2 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.49 2008/08/02 21:23:24 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.50 2008/11/17 07:21:43 jer Exp $ + + 17 Nov 2008; Jeroen Roovers <jer@gentoo.org> + +files/pbzip2-1.0.2-uclibc.patch, pbzip2-1.0.2-r1.ebuild: + Patch for uclibc support (no getloadavg, bug #246810). Let make pick up + CFLAGS from environment. Use canonical CXX. 02 Aug 2008; Markus Rothe <corsair@gentoo.org> pbzip2-1.0.2-r1.ebuild: Stable on ppc64; bug #229881 diff --git a/app-arch/pbzip2/files/pbzip2-1.0.2-uclibc.patch b/app-arch/pbzip2/files/pbzip2-1.0.2-uclibc.patch new file mode 100644 index 000000000000..4fe1f48bdac4 --- /dev/null +++ b/app-arch/pbzip2/files/pbzip2-1.0.2-uclibc.patch @@ -0,0 +1,24 @@ +diff -urp pbzip2-1.0.2/pbzip2.cpp pbzip2-1.0.2-uclibc/pbzip2.cpp +--- pbzip2-1.0.2/pbzip2.cpp 2007-07-27 12:41:47.000000000 -0400 ++++ pbzip2-1.0.2-uclibc/pbzip2.cpp 2008-11-14 22:26:24.000000000 -0500 +@@ -128,7 +128,7 @@ + //#define PBZIP_NO_LOADAVG + + // detect systems that are known not to support load average code +-#if defined (WIN32) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (__BORLANDC__) || defined (__hpux) || defined (__osf__) ++#if defined (WIN32) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (__BORLANDC__) || defined (__hpux) || defined (__osf__) || defined(__UCLIBC__) + #define PBZIP_NO_LOADAVG + #endif + +@@ -1607,7 +1607,11 @@ void usage(char* progname) + { + banner(); + fprintf(stderr, "\nInvalid command line! Aborting...\n\n"); ++#if defined(PBZIP_NO_LOADAVG) ++ fprintf(stderr, "Usage: %s [-1 .. -9] [-b#cdfkp#qrtV] <filename> <filename2> <filenameN>\n", progname); ++#else + fprintf(stderr, "Usage: %s [-1 .. -9] [-b#cdfklp#qrtV] <filename> <filename2> <filenameN>\n", progname); ++#endif + fprintf(stderr, " -b# : where # is the file block size in 100k (default 9 = 900k)\n"); + fprintf(stderr, " -c : output to standard out (stdout)\n"); + fprintf(stderr, " -d : decompress file\n"); diff --git a/app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild b/app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild index 0f63f39a7181..144f9f810381 100644 --- a/app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild +++ b/app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild,v 1.8 2008/09/29 01:46:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild,v 1.9 2008/11/17 07:21:43 jer Exp $ -inherit multilib +inherit multilib eutils DESCRIPTION="parallel bzip2 (de)compressor using libbz2" HOMEPAGE="http://compression.ca/pbzip2/" @@ -18,10 +18,12 @@ RDEPEND="${DEPEND}" src_unpack() { unpack ${A} - sed -i -e 's:-O3:${CFLAGS}:g' ${P}/Makefile || die + sed -e 's:-O3:$(CFLAGS):g' -e 's:g++:$(CXX):g' -i ${P}/Makefile || die + epatch "${FILESDIR}"/${P}-uclibc.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" |