diff options
author | Michał Górny <mgorny@gentoo.org> | 2014-04-28 17:45:05 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2014-04-28 17:45:05 +0000 |
commit | 2b17397286a6e17460f05e2f5b1119843517ec38 (patch) | |
tree | b9822446a0d2e9ad4ebdc39e2f8484a1e9efbe2d /sys-apps/file | |
parent | Replace multilib_build_binaries with multilib_is_native_abi, in order to put ... (diff) | |
download | gentoo-2-2b17397286a6e17460f05e2f5b1119843517ec38.tar.gz gentoo-2-2b17397286a6e17460f05e2f5b1119843517ec38.tar.bz2 gentoo-2-2b17397286a6e17460f05e2f5b1119843517ec38.zip |
Replace multilib_build_binaries with multilib_is_native_abi, in order to put an end to the confusion introduced by having two functions, the proper one suggesting it is just for binaries.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-apps/file')
-rw-r--r-- | sys-apps/file/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/file/file-5.18-r1.ebuild | 6 | ||||
-rw-r--r-- | sys-apps/file/file-9999.ebuild | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog index 7c454239cb77..fc69b24416ad 100644 --- a/sys-apps/file/ChangeLog +++ b/sys-apps/file/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/file # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.273 2014/03/27 14:46:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.274 2014/04/28 17:45:05 mgorny Exp $ + + 28 Apr 2014; Michał Górny <mgorny@gentoo.org> file-5.18-r1.ebuild, + file-9999.ebuild: + Replace multilib_build_binaries with multilib_is_native_abi, in order to put + an end to the confusion introduced by having two functions, the proper one + suggesting it is just for binaries. 27 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> file-5.18-r1.ebuild: Update blockers for libmagic.so* wrt #505936 by Graham Murray diff --git a/sys-apps/file/file-5.18-r1.ebuild b/sys-apps/file/file-5.18-r1.ebuild index 046abcd7f746..0d3040d64b87 100644 --- a/sys-apps/file/file-5.18-r1.ebuild +++ b/sys-apps/file/file-5.18-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/sys-apps/file/file-5.18-r1.ebuild,v 1.2 2014/03/27 14:46:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.18-r1.ebuild,v 1.3 2014/04/28 17:45:05 mgorny Exp $ EAPI="4" PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) @@ -72,7 +72,7 @@ src_configure() { } multilib_src_compile() { - if multilib_build_binaries ; then + if multilib_is_native_abi ; then emake else emake -C src libmagic.la @@ -90,7 +90,7 @@ src_compile() { } multilib_src_install() { - if multilib_build_binaries ; then + if multilib_is_native_abi ; then default else emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild index 189326094ced..76fdb846693f 100644 --- a/sys-apps/file/file-9999.ebuild +++ b/sys-apps/file/file-9999.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/sys-apps/file/file-9999.ebuild,v 1.6 2014/03/27 03:30:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-9999.ebuild,v 1.7 2014/04/28 17:45:05 mgorny Exp $ EAPI="4" PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) @@ -70,7 +70,7 @@ src_configure() { } multilib_src_compile() { - if multilib_build_binaries ; then + if multilib_is_native_abi ; then emake else emake -C src libmagic.la @@ -88,7 +88,7 @@ src_compile() { } multilib_src_install() { - if multilib_build_binaries ; then + if multilib_is_native_abi ; then default else emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" |