diff options
| -rw-r--r-- | app-arch/bzip2/ChangeLog | 11 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.4.ebuild | 73 | ||||
| -rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch | 25 | ||||
| -rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.4-saneso.patch | 13 | ||||
| -rw-r--r-- | app-arch/bzip2/files/digest-bzip2-1.0.4 | 3 |
5 files changed, 123 insertions, 2 deletions
diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog index 9ae286ddee73..66fc06ecbc92 100644 --- a/app-arch/bzip2/ChangeLog +++ b/app-arch/bzip2/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/bzip2 -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.44 2006/10/17 11:14:02 uberlord Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.45 2007/01/06 01:50:31 vapier Exp $ + +*bzip2-1.0.4 (06 Jan 2007) + + 06 Jan 2007; Mike Frysinger <vapier@gentoo.org> + +files/bzip2-1.0.4-makefile-CFLAGS.patch, +files/bzip2-1.0.4-saneso.patch, + +bzip2-1.0.4.ebuild: + Version bump #160283 by armin76. 17 Oct 2006; Roy Marples <uberlord@gentoo.org> bzip2-1.0.3-r6.ebuild: Added ~sparc-fbsd keyword. diff --git a/app-arch/bzip2/bzip2-1.0.4.ebuild b/app-arch/bzip2/bzip2-1.0.4.ebuild new file mode 100644 index 000000000000..03bc3fba5250 --- /dev/null +++ b/app-arch/bzip2/bzip2-1.0.4.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.4.ebuild,v 1.1 2007/01/06 01:50:31 vapier Exp $ + +inherit eutils multilib toolchain-funcs flag-o-matic + +DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" +HOMEPAGE="http://www.bzip.org/" +SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz" + +LICENSE="BZIP2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="static" + +DEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch + epatch "${FILESDIR}"/${PN}-1.0.4-saneso.patch + epatch "${FILESDIR}"/${PN}-1.0.3-shared-largefile-support.patch + epatch "${FILESDIR}"/${PN}-1.0.2-progress.patch + epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch + sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die "sed manpath" + + # - Generate symlinks instead of hardlinks + # - pass custom variables to control libdir + sed -i \ + -e 's:ln -s -f $(PREFIX)/bin/:ln -s :' \ + -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ + Makefile || die "sed links" +} + +src_compile() { + local makeopts=" + CC=$(tc-getCC) + AR=$(tc-getAR) + RANLIB=$(tc-getRANLIB) + " + if ! use build ; then + emake ${makeopts} -f Makefile-libbz2_so all || die "Make failed libbz2" + fi + use static && append-flags -static + emake LDFLAGS="${LDFLAGS}" ${makeopts} all || die "Make failed" + + if ! tc-is-cross-compiler ; then + make check || die "test failed" + fi +} + +src_install() { + emake PREFIX="${D}"/usr LIBDIR=$(get_libdir) install || die + + # move bzip2 binaries to /bin and use the shared libbz2.so + mkdir -p "${D}"/bin + mv "${D}"/usr/bin/* "${D}"/bin/ + into / + if ! use static ; then + newbin bzip2-shared bzip2 || die "dobin shared" + fi + dolib.so "${S}"/libbz2.so.${PV} || die "dolib shared" + for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do + dosym libbz2.so.${PV} /$(get_libdir)/${v} + done + gen_usr_ldscript libbz2.so + + dodoc README* CHANGES bzip2.txt manual.* + + dosym bzip2 /bin/bzcat + dosym bzip2 /bin/bunzip2 +} diff --git a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch new file mode 100644 index 000000000000..de881af2b3d0 --- /dev/null +++ b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch @@ -0,0 +1,25 @@ +--- Makefile ++++ Makefile +@@ -18,10 +18,9 @@ + CC=gcc + AR=ar + RANLIB=ranlib +-LDFLAGS= + + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS+=-Wall -Winline $(BIGFILES) + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local +--- Makefile-libbz2_so ++++ Makefile-libbz2_so +@@ -24,7 +24,7 @@ + SHELL=/bin/sh + CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS+=-fpic -fPIC -Wall -Winline + + OBJS= blocksort.o \ + huffman.o \ diff --git a/app-arch/bzip2/files/bzip2-1.0.4-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.4-saneso.patch new file mode 100644 index 000000000000..0469f46b8a56 --- /dev/null +++ b/app-arch/bzip2/files/bzip2-1.0.4-saneso.patch @@ -0,0 +1,13 @@ +--- Makefile-libbz2_so ++++ Makefile-libbz2_so +@@ -35,8 +35,8 @@ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 ++ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.4 libbz2.so.1.0 + diff --git a/app-arch/bzip2/files/digest-bzip2-1.0.4 b/app-arch/bzip2/files/digest-bzip2-1.0.4 new file mode 100644 index 000000000000..a1b2965623ed --- /dev/null +++ b/app-arch/bzip2/files/digest-bzip2-1.0.4 @@ -0,0 +1,3 @@ +MD5 fc310b254f6ba5fbb5da018f04533688 bzip2-1.0.4.tar.gz 841221 +RMD160 438365cb911ef84b3bd6643e0d39f6b7567f0447 bzip2-1.0.4.tar.gz 841221 +SHA256 f41c3898fbd53e68e0b052418960e538813cc98afcd72b2b604079d8de3e529c bzip2-1.0.4.tar.gz 841221 |