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 | 83763489c2a9fbb88193f3275e2712820e762399 (patch) | |
| tree | 3bc076ff88ae8309526d7e3441ff68b2e027608c /eclass | |
| parent | Version bump. Removed old (diff) | |
| download | gentoo-2-83763489c2a9fbb88193f3275e2712820e762399.tar.gz gentoo-2-83763489c2a9fbb88193f3275e2712820e762399.tar.bz2 gentoo-2-83763489c2a9fbb88193f3275e2712820e762399.zip | |
Run multilib header wrapping only when multiple ABIs are enabled, bug #491752. Other eclasses do that already.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/cmake-multilib.eclass | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d0f79236da21..5b36635b66c6 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1062 2013/11/20 09:19:19 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1063 2013/11/20 19:23:45 mgorny Exp $ + + 20 Nov 2013; Michał Górny <mgorny@gentoo.org> cmake-multilib.eclass: + Run multilib header wrapping only when multiple ABIs are enabled, bug + #491752. Other eclasses do that already. 20 Nov 2013; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass: Added 'replace-hcflags()'. Filters HCFLAGS. 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 "${@}" |