diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-04-21 07:32:16 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-04-21 07:32:16 +0000 |
| commit | 119457e6ce728a3a75a8beac3155ae712bfc09fd (patch) | |
| tree | 72aeb58d38dd50c374f71ce02545d41c6eedaeed /dev-libs | |
| parent | Stabilise on amd64 and x86. Drop older. (diff) | |
| download | gentoo-2-119457e6ce728a3a75a8beac3155ae712bfc09fd.tar.gz gentoo-2-119457e6ce728a3a75a8beac3155ae712bfc09fd.tar.bz2 gentoo-2-119457e6ce728a3a75a8beac3155ae712bfc09fd.zip | |
Use multilib_build_binaries consistently, and the new multilib_native_use* functions.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libpcre/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-8.35.ebuild | 17 |
2 files changed, 13 insertions, 10 deletions
diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog index d121d03af611..641056a9d306 100644 --- a/dev-libs/libpcre/ChangeLog +++ b/dev-libs/libpcre/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libpcre # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.229 2014/04/05 22:07:06 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.230 2014/04/21 07:32:16 mgorny Exp $ + + 21 Apr 2014; Michał Górny <mgorny@gentoo.org> libpcre-8.35.ebuild: + Use multilib_build_binaries consistently, and the new multilib_native_use* + functions. *libpcre-8.35 (05 Apr 2014) diff --git a/dev-libs/libpcre/libpcre-8.35.ebuild b/dev-libs/libpcre/libpcre-8.35.ebuild index a2a61b9ee415..402766cd7455 100644 --- a/dev-libs/libpcre/libpcre-8.35.ebuild +++ b/dev-libs/libpcre/libpcre-8.35.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/libpcre/libpcre-8.35.ebuild,v 1.1 2014/04/05 22:07:06 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild,v 1.2 2014/04/21 07:32:16 mgorny Exp $ EAPI="4" @@ -52,16 +52,16 @@ multilib_src_configure() { [[ ${CHOST} == *-mint* ]] && append-cppflags -D_GNU_SOURCE ECONF_SOURCE="${S}" econf \ --with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \ - $(multilib_is_native_abi && use_enable bzip2 pcregrep-libbz2) \ + $(multilib_native_use_enable bzip2 pcregrep-libbz2) \ $(use_enable cxx cpp) \ $(use_enable jit) $(use_enable jit pcregrep-jit) \ $(use_enable pcre16) \ $(use_enable pcre32) \ - $(multilib_build_binaries && use_enable libedit pcretest-libedit) \ - $(multilib_build_binaries && use_enable readline pcretest-libreadline) \ + $(multilib_native_use_enable libedit pcretest-libedit) \ + $(multilib_native_use_enable readline pcretest-libreadline) \ $(use_enable static-libs static) \ $(use_enable unicode utf) $(use_enable unicode unicode-properties) \ - $(multilib_is_native_abi && use_enable zlib pcregrep-libz) \ + $(multilib_native_use_enable zlib pcregrep-libz) \ --enable-pcre8 \ --enable-shared \ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ @@ -69,16 +69,15 @@ multilib_src_configure() { } multilib_src_compile() { - emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") + emake V=1 $(multilib_build_binaries || echo "bin_PROGRAMS=") } multilib_src_install() { emake \ DESTDIR="${D}" \ - $(multilib_build_binaries || echo "bin_PROGRAMS=") \ - $(multilib_is_native_abi || echo "dist_html_DATA=") \ + $(multilib_build_binaries || echo "bin_PROGRAMS= dist_html_DATA=") \ install - multilib_is_native_abi && gen_usr_ldscript -a pcre + multilib_build_binaries && gen_usr_ldscript -a pcre } multilib_src_install_all() { |