diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-04-29 20:54:54 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-04-29 20:54:54 +0000 |
| commit | 957dea54df8241cd1894e4d012c8ea8c9f9153fe (patch) | |
| tree | cc8eaafa32c3a34df6cf686cbf5ff9bb699e47f9 /eclass | |
| parent | Add arm64/m68k love. (diff) | |
| download | gentoo-2-957dea54df8241cd1894e4d012c8ea8c9f9153fe.tar.gz gentoo-2-957dea54df8241cd1894e4d012c8ea8c9f9153fe.tar.bz2 gentoo-2-957dea54df8241cd1894e4d012c8ea8c9f9153fe.zip | |
Move conditionals for enabling wrappers into multilib_prepare_wrappers() and multilib_install_wrappers().
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/cmake-multilib.eclass | 11 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 6 | ||||
| -rw-r--r-- | eclass/multilib-minimal.eclass | 12 |
4 files changed, 20 insertions, 16 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index b17463823586..26abcf7b6a3e 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1227 2014/04/28 17:38:21 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1228 2014/04/29 20:54:54 mgorny Exp $ + + 29 Apr 2014; Michał Górny <mgorny@gentoo.org> cmake-multilib.eclass, + multilib-build.eclass, multilib-minimal.eclass: + Move conditionals for enabling wrappers into multilib_prepare_wrappers() and + multilib_install_wrappers(). 28 Apr 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Deprecate multilib_build_binaries, and switch the code to use diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass index 02d600815417..e7c9059e396b 100644 --- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.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/cmake-multilib.eclass,v 1.5 2014/04/03 22:09:36 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v 1.6 2014/04/29 20:54:54 mgorny Exp $ # @ECLASS: cmake-multilib.eclass # @MAINTAINER: @@ -50,12 +50,9 @@ cmake-multilib_src_install() { cmake-multilib_secure_install() { cmake-utils_src_install "${@}" - # Do multilib magic only when >1 ABI is used. - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then - multilib_prepare_wrappers - # Make sure all headers are the same for each ABI. - multilib_check_headers - fi + multilib_prepare_wrappers + # Make sure all headers are the same for each ABI. + multilib_check_headers } multilib_foreach_abi cmake-multilib_secure_install "${@}" diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 2ca8d82a6f9a..b7a1aff8c3c2 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.40 2014/04/28 17:38:21 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.41 2014/04/29 20:54:54 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -295,6 +295,8 @@ multilib_prepare_wrappers() { [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" + [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return + local root=${1:-${ED}} local f @@ -419,6 +421,8 @@ multilib_install_wrappers() { [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" + [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return + local root=${1:-${ED}} if [[ -d "${ED}"/tmp/multilib-include ]]; then diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index 2fec9cfc13a5..c638d0735133 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.7 2013/12/27 22:47:14 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.8 2014/04/29 20:54:54 mgorny Exp $ # @ECLASS: multilib-minimal.eclass # @MAINTAINER: @@ -108,11 +108,9 @@ multilib-minimal_src_install() { emake DESTDIR="${D}" install fi fi - # Do multilib magic only when >1 ABI is used. - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then - multilib_prepare_wrappers - multilib_check_headers - fi + + multilib_prepare_wrappers + multilib_check_headers popd >/dev/null || die } multilib_foreach_abi multilib-minimal_abi_src_install |