diff options
author | 2014-01-22 22:37:09 +0000 | |
---|---|---|
committer | 2014-01-22 22:37:09 +0000 | |
commit | df80a446cd08ac875d06c57e64b6c10012c306aa (patch) | |
tree | 2550ad000cc76db334f49e9e8bd120ee531f7275 /dev-libs/apr | |
parent | Fix cross-compiling. (diff) | |
download | gentoo-2-df80a446cd08ac875d06c57e64b6c10012c306aa.tar.gz gentoo-2-df80a446cd08ac875d06c57e64b6c10012c306aa.tar.bz2 gentoo-2-df80a446cd08ac875d06c57e64b6c10012c306aa.zip |
Drop old static-libs hacks now that we use local libtool #374355#16 by Rafał Mużyło.
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'dev-libs/apr')
-rw-r--r-- | dev-libs/apr/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/apr/apr-1.5.0-r1.ebuild | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog index ac318d5e48a6..b54953ceca47 100644 --- a/dev-libs/apr/ChangeLog +++ b/dev-libs/apr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/apr # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.206 2014/01/22 22:27:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.207 2014/01/22 22:37:09 vapier Exp $ + + 22 Jan 2014; Mike Frysinger <vapier@gentoo.org> apr-1.5.0-r1.ebuild: + Drop old static-libs hacks now that we use local libtool #374355#16 by Rafał + Mużyło. 22 Jan 2014; Mike Frysinger <vapier@gentoo.org> +files/apr-1.5.0-cross-types.patch, apr-1.5.0-r1.ebuild: diff --git a/dev-libs/apr/apr-1.5.0-r1.ebuild b/dev-libs/apr/apr-1.5.0-r1.ebuild index 97f54060f4e8..92dd0f579095 100644 --- a/dev-libs/apr/apr-1.5.0-r1.ebuild +++ b/dev-libs/apr/apr-1.5.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.0-r1.ebuild,v 1.3 2014/01/22 22:27:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.0-r1.ebuild,v 1.4 2014/01/22 22:37:09 vapier Exp $ EAPI="4" @@ -80,10 +80,11 @@ src_configure() { esac fi - CONFIG_SHELL="${EPREFIX}"/bin/bash econf \ + econf \ --enable-layout=gentoo \ --enable-nonportable-atomics \ --enable-threads \ + $(use_enable static-libs static) \ ${myconf} } @@ -106,16 +107,12 @@ src_compile() { src_install() { default - find "${ED}" -name "*.la" -exec rm -f {} + + find "${ED}" -name "*.la" -delete if use doc; then dohtml -r docs/dox/html/* fi - if ! use static-libs; then - find "${ED}" -name "*.a" -exec rm -f {} + - fi - # This file is only used on AIX systems, which Gentoo is not, # and causes collisions between the SLOTs, so remove it. # Even in Prefix, we don't need this on AIX. |