diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-01-14 20:08:13 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-01-14 20:08:13 +0000 |
| commit | d0b0e4261ac7360ed1909e71f55967335d546884 (patch) | |
| tree | 7263ee19779d64b727ce3f8f9a414bd2eaad3fa2 | |
| parent | Stable for HPPA (bug #254307). (diff) | |
| download | gentoo-2-d0b0e4261ac7360ed1909e71f55967335d546884.tar.gz gentoo-2-d0b0e4261ac7360ed1909e71f55967335d546884.tar.bz2 gentoo-2-d0b0e4261ac7360ed1909e71f55967335d546884.zip | |
Respect AR/RANLIB in env.
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
| -rw-r--r-- | dev-libs/libaio/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch | 17 | ||||
| -rw-r--r-- | dev-libs/libaio/libaio-0.3.107.ebuild | 7 |
3 files changed, 25 insertions, 5 deletions
diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog index 97b7312e3109..8212fbc13fd9 100644 --- a/dev-libs/libaio/ChangeLog +++ b/dev-libs/libaio/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libaio # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.42 2009/01/11 21:10:17 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.43 2009/01/14 20:08:12 vapier Exp $ + + 14 Jan 2009; Mike Frysinger <vapier@gentoo.org> + +files/libaio-0.3.107-ar-ranlib.patch, libaio-0.3.107.ebuild: + Respect AR/RANLIB in env. 11 Jan 2009; Markus Meier <maekke@gentoo.org> libaio-0.3.107.ebuild: x86 stable, bug #254291 diff --git a/dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch b/dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch new file mode 100644 index 000000000000..d1ec1403a0e9 --- /dev/null +++ b/dev-libs/libaio/files/libaio-0.3.107-ar-ranlib.patch @@ -0,0 +1,17 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -42,10 +42,12 @@ + $(CC) $(L_CFLAGS) -c -o $@ $< + + ++AR ?= ar ++RANLIB ?= ranlib + libaio.a: $(libaio_objs) + rm -f libaio.a +- ar r libaio.a $^ +- ranlib libaio.a ++ $(AR) r libaio.a $^ ++ $(RANLIB) libaio.a + + $(libname): $(libaio_sobjs) libaio.map + $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname,$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) diff --git a/dev-libs/libaio/libaio-0.3.107.ebuild b/dev-libs/libaio/libaio-0.3.107.ebuild index e304ff16ed7a..7f5e763adef8 100644 --- a/dev-libs/libaio/libaio-0.3.107.ebuild +++ b/dev-libs/libaio/libaio-0.3.107.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.107.ebuild,v 1.7 2009/01/11 21:10:17 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.107.ebuild,v 1.8 2009/01/14 20:08:12 vapier Exp $ inherit eutils multilib toolchain-funcs @@ -16,20 +16,19 @@ KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc IUSE="" RESTRICT="test" -DEPEND="" - src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-sparc.patch epatch "${FILESDIR}"/${P}-install-to-slash.patch + epatch "${FILESDIR}"/${PN}-0.3.107-ar-ranlib.patch epatch "${FILESDIR}"/${PN}-0.3.106-build.patch epatch "${FILESDIR}"/${PN}-0.3.107-generic-arch.patch sed -i "/^libdir=/s:lib$:$(get_libdir):" src/Makefile Makefile } src_compile() { - tc-export CC + tc-export AR CC RANLIB emake || die "emake failed" } |