diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-11-20 19:23:45 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-11-20 19:23:45 +0000 |
| commit | 743811b59546f76adec1ef4c5d79aa2f5cd176ed (patch) | |
| tree | 553cd7386b466af58b668147bef34a8850bb4fb9 /eclass/cmake-multilib.eclass | |
| parent | Version bump. Removed old (diff) | |
| download | historical-743811b59546f76adec1ef4c5d79aa2f5cd176ed.tar.gz historical-743811b59546f76adec1ef4c5d79aa2f5cd176ed.tar.bz2 historical-743811b59546f76adec1ef4c5d79aa2f5cd176ed.zip | |
Run multilib header wrapping only when multiple ABIs are enabled, bug #491752. Other eclasses do that already.
Diffstat (limited to 'eclass/cmake-multilib.eclass')
| -rw-r--r-- | eclass/cmake-multilib.eclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass index 62f7c091372d..0a5a5a8e2f95 100644 --- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v 1.3 2013/09/06 17:11:52 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v 1.4 2013/11/20 19:23:45 mgorny Exp $ # @ECLASS: cmake-multilib.eclass # @MAINTAINER: @@ -48,9 +48,12 @@ cmake-multilib_src_install() { cmake-multilib_secure_install() { cmake-utils_src_install "${@}" - # Make sure all headers are the same for each ABI. - multilib_prepare_wrappers - multilib_check_headers + # 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_foreach_abi cmake-multilib_secure_install "${@}" |