diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-08-20 03:02:24 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-08-20 03:02:24 +0000 |
| commit | 1ef98b2b95cd331033bbc521c6e3c464e5cb3966 (patch) | |
| tree | 4b8c3c687b8d683763147b2d5c78163e8717b19f /app-arch | |
| parent | dont want to pass --libdir because it will just cause gcc to install into a l... (diff) | |
| download | historical-1ef98b2b95cd331033bbc521c6e3c464e5cb3966.tar.gz historical-1ef98b2b95cd331033bbc521c6e3c464e5cb3966.tar.bz2 historical-1ef98b2b95cd331033bbc521c6e3c464e5cb3966.zip | |
rework how we handle tests/cross-compiling
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/bzip2/Manifest | 29 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.3-r5.ebuild | 13 | ||||
| -rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.3-no-test.patch | 9 |
3 files changed, 35 insertions, 16 deletions
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest index 693c49382fc1..dd986fe090af 100644 --- a/app-arch/bzip2/Manifest +++ b/app-arch/bzip2/Manifest @@ -1,16 +1,27 @@ -MD5 c7ae74d80c4fd172fc83b5f41de30ea4 bzip2-1.0.2-r5.ebuild 2203 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 1e64f49a7bad858e31933ff6980046d1 ChangeLog 6860 -MD5 a0e624f4fead7d41bfd4d9f9b70d9cce bzip2-1.0.3-r5.ebuild 2348 +MD5 c7ae74d80c4fd172fc83b5f41de30ea4 bzip2-1.0.2-r5.ebuild 2203 +MD5 cbe8b653dd6043d167a2d62c777d4612 bzip2-1.0.3-r5.ebuild 2221 MD5 1f5df1025188e55aea3d0835dfafe4da bzip2-1.0.3-r4.ebuild 2287 -MD5 be84e51b1bd56731f5d7762980e3ad47 files/bzip2-1.0.3-makefile-CFLAGS.patch 489 -MD5 382f154f0ba01de10aff6207652d6799 files/digest-bzip2-1.0.2-r5 63 -MD5 9c63b399f71b03f2a58b061c1e038d0c files/bzip2-1.0.2-saneso.patch 457 +MD5 1e64f49a7bad858e31933ff6980046d1 ChangeLog 6860 +MD5 55623d1117616943ca093e67c20e8ae1 files/bzip2-1.0.3-no-test.patch 161 +MD5 a0833247f0c02ccb65cceb33ea521457 files/bzip2-1.0.2-chmod.patch 2780 +MD5 d1cf85cb43e35c9ecba9954295318ab8 files/bzip2-1.0.3-saneso.patch 323 MD5 613ebf0fa8c5fd2ed2973ffe0d727e2a files/bzip2-1.0.3-shared-largefile-support.patch 404 +MD5 be84e51b1bd56731f5d7762980e3ad47 files/bzip2-1.0.3-makefile-CFLAGS.patch 489 +MD5 cc73bebefba3a38c58fc49b49d7d25a7 files/bzip2-1.0.2-NULL-ptr-check.patch 838 MD5 378e8d34dd95cc65b7f65565df5d85f7 files/bzip2-1.0.2-makefile-CFLAGS.patch 841 MD5 f413035bf75710d87670f302692e1233 files/digest-bzip2-1.0.3-r4 63 MD5 5f7a98f0aaaed6554126d30e28383ee0 files/bzip2-1.0.2-progress.patch 6141 -MD5 cc73bebefba3a38c58fc49b49d7d25a7 files/bzip2-1.0.2-NULL-ptr-check.patch 838 -MD5 a0833247f0c02ccb65cceb33ea521457 files/bzip2-1.0.2-chmod.patch 2780 -MD5 d1cf85cb43e35c9ecba9954295318ab8 files/bzip2-1.0.3-saneso.patch 323 MD5 f413035bf75710d87670f302692e1233 files/digest-bzip2-1.0.3-r5 63 +MD5 382f154f0ba01de10aff6207652d6799 files/digest-bzip2-1.0.2-r5 63 +MD5 9c63b399f71b03f2a58b061c1e038d0c files/bzip2-1.0.2-saneso.patch 457 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDBp1jgIKl8Uu19MoRAtVqAJ9yDOwdq9EqpGZQDnnwKns0ZPv2mgCeI+Uj +c11Jy8tKXGmwVf+Qx6TMh+o= +=l4le +-----END PGP SIGNATURE----- diff --git a/app-arch/bzip2/bzip2-1.0.3-r5.ebuild b/app-arch/bzip2/bzip2-1.0.3-r5.ebuild index b8a975231043..51f354d0a161 100644 --- a/app-arch/bzip2/bzip2-1.0.3-r5.ebuild +++ b/app-arch/bzip2/bzip2-1.0.3-r5.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.3-r5.ebuild,v 1.4 2005/08/19 19:21:17 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.3-r5.ebuild,v 1.5 2005/08/20 03:02:24 vapier Exp $ inherit eutils multilib toolchain-funcs flag-o-matic @@ -24,6 +24,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-shared-largefile-support.patch epatch "${FILESDIR}"/${PN}-1.0.2-progress.patch epatch "${FILESDIR}"/${PN}-1.0.2-chmod.patch + epatch "${FILESDIR}"/${P}-no-test.patch sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die "sed manpath" # - Generate symlinks instead of hardlinks @@ -32,12 +33,6 @@ src_unpack() { -e 's:ln $(PREFIX)/bin/:ln -s :' \ -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ Makefile || die "sed links" - - # 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 ]] && tc-is-cross-compiler ; then - sed -i -e 's:./bzip2 -:bzip2 -:g' Makefile || die "sed cross-compile" - fi } src_compile() { @@ -51,6 +46,10 @@ src_compile() { fi use static && append-flags -static emake ${makeopts} all || die "Make failed" + + if ! tc-is-cross-compiler ; then + make check || die "test failed" + fi } src_install() { diff --git a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch new file mode 100644 index 000000000000..672c89dfbd20 --- /dev/null +++ b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch @@ -0,0 +1,9 @@ +--- Makefile ++++ Makefile +@@ -23,5 +23,5 @@ + bzlib.o + +-all: libbz2.a bzip2 bzip2recover test ++all: libbz2.a bzip2 bzip2recover + + bzip2: libbz2.a bzip2.o |