diff options
author | Michał Górny <mgorny@gentoo.org> | 2014-04-21 07:27:53 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2014-04-21 07:27:53 +0000 |
commit | c73f3fc687681eef43a999b32c86c608087a843d (patch) | |
tree | 755dfd89d9cd55dbe2fea7adc245b9dab45b6a9b /eclass | |
parent | Stabilise on amd64 and x86. Drop older. (diff) | |
download | gentoo-2-c73f3fc687681eef43a999b32c86c608087a843d.tar.gz gentoo-2-c73f3fc687681eef43a999b32c86c608087a843d.tar.bz2 gentoo-2-c73f3fc687681eef43a999b32c86c608087a843d.zip |
...and make multilib_build_binaries stand-alone.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/ChangeLog | 5 | ||||
-rw-r--r-- | eclass/multilib-build.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index daaf80440deb..3a68d622bf01 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1216 2014/04/21 07:22:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1217 2014/04/21 07:27:53 mgorny Exp $ + + 21 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: + ...and make multilib_build_binaries stand-alone. 21 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Make multilib_is_native_abi equivalent to multilib_build_binaries, until all diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 9d340e908892..e6d990040470 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -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/eclass/multilib-build.eclass,v 1.36 2014/04/21 07:22:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.37 2014/04/21 07:27:53 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -457,7 +457,7 @@ multilib_build_binaries() { [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments" - [[ ${COMPLETE_MULTILIB} == yes ]] || multilib_is_native_abi + [[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]] } # @FUNCTION: multilib_native_use_with |