diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-02-11 23:04:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-02-11 23:04:37 +0000 |
| commit | c920c8bc5f01f70fd47d3222114ecf78810e3154 (patch) | |
| tree | 47e5b940fa31439d4aeb0d6a4617e4998afb21a4 /app-arch | |
| parent | Add fix for ia64/s390. (diff) | |
| download | gentoo-2-c920c8bc5f01f70fd47d3222114ecf78810e3154.tar.gz gentoo-2-c920c8bc5f01f70fd47d3222114ecf78810e3154.tar.bz2 gentoo-2-c920c8bc5f01f70fd47d3222114ecf78810e3154.zip | |
Stabilize and add patch from Fedora.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/bzip2/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.2-r4.ebuild | 9 | ||||
| -rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.2-saneso.patch | 13 |
3 files changed, 23 insertions, 5 deletions
diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog index 89978e45ec14..0e17d9466e08 100644 --- a/app-arch/bzip2/ChangeLog +++ b/app-arch/bzip2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/bzip2 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.18 2005/02/06 19:25:09 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.19 2005/02/11 23:04:37 vapier Exp $ + + 11 Feb 2005; Mike Frysinger <vapier@gentoo.org> + +files/bzip2-1.0.2-saneso.patch, bzip2-1.0.2-r4.ebuild: + Stabilize and add patch from Fedora. 06 Feb 2005; Joshua Kinard <kumba@gentoo.org> bzip2-1.0.2-r4.ebuild: Marked stable on mips. diff --git a/app-arch/bzip2/bzip2-1.0.2-r4.ebuild b/app-arch/bzip2/bzip2-1.0.2-r4.ebuild index 3a4cb2091010..356696248d27 100644 --- a/app-arch/bzip2/bzip2-1.0.2-r4.ebuild +++ b/app-arch/bzip2/bzip2-1.0.2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r4.ebuild,v 1.7 2005/02/06 19:25:09 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r4.ebuild,v 1.8 2005/02/11 23:04:37 vapier Exp $ inherit toolchain-funcs flag-o-matic @@ -10,7 +10,7 @@ SRC_URI="ftp://sources.redhat.com/pub/bzip2/v102/${P}.tar.gz" LICENSE="BZIP2" SLOT="0" -KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc ~ppc64 s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" IUSE="build static" DEPEND="virtual/libc" @@ -20,13 +20,14 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${PV}-NULL-ptr-check.patch epatch ${FILESDIR}/${PV}-makefile-CFLAGS.patch + epatch ${FILESDIR}/${P}-saneso.patch sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die use static && append-flags -static # bzip2 will to run itself after it has built itself which we # can't do if we are cross compiling. -solar - if [[ -x /bin/bzip2 ]] && [[ ${CTARGET} != ${CHOST} ]] ; then + if [[ -x /bin/bzip2 ]] && tc-is-cross-compiler ; then sed -i -e 's:./bzip2 -:bzip2 -:g' Makefile || die fi } @@ -58,7 +59,7 @@ src_install() { [[ -z ${CONF_LIBDIR} ]] && CONF_LIBDIR="lib" [[ ${CONF_LIBDIR} != "lib" ]] && mv ${D}/usr/lib ${D}/usr/${CONF_LIBDIR} - dolib.so ${S}/libbz2.so.${PV} + dolib.so "${S}"/libbz2.so.${PV} dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1.0 dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1 diff --git a/app-arch/bzip2/files/bzip2-1.0.2-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.2-saneso.patch new file mode 100644 index 000000000000..0231a3cf93de --- /dev/null +++ b/app-arch/bzip2/files/bzip2-1.0.2-saneso.patch @@ -0,0 +1,13 @@ +taken from fedora + +--- bzip2-1.0.2/Makefile-libbz2_so.saneso Wed Jan 30 15:44:10 2002 ++++ bzip2-1.0.2/Makefile-libbz2_so Wed Jan 30 15:44:26 2002 +@@ -20,7 +20,7 @@ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.2 $(OBJS) ++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.2 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.2 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.2 libbz2.so.1.0 |