diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-06-28 12:42:48 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-06-28 12:42:48 +0000 |
| commit | 2d96dfb299925bcc7e8b987925fe040ba2e5f422 (patch) | |
| tree | bd925e4732fb34c9b67246e3f754c7ea3211298b /eclass/autotools-multilib.eclass | |
| parent | fix cross compilation (diff) | |
| download | gentoo-2-2d96dfb299925bcc7e8b987925fe040ba2e5f422.tar.gz gentoo-2-2d96dfb299925bcc7e8b987925fe040ba2e5f422.tar.bz2 gentoo-2-2d96dfb299925bcc7e8b987925fe040ba2e5f422.zip | |
Disable trying (and failing) to wrap headers when multilib is disabled, bug #474920.
Diffstat (limited to 'eclass/autotools-multilib.eclass')
| -rw-r--r-- | eclass/autotools-multilib.eclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass index ab06e9122003..0984c251d05b 100644 --- a/eclass/autotools-multilib.eclass +++ b/eclass/autotools-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/autotools-multilib.eclass,v 1.16 2013/05/14 17:33:08 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.17 2013/06/28 12:42:48 mgorny Exp $ # @ECLASS: autotools-multilib.eclass # @MAINTAINER: @@ -53,9 +53,12 @@ autotools-multilib_src_install() { autotools-multilib_secure_install() { autotools-utils_src_install "${@}" - multilib_prepare_wrappers - # Make sure all headers are the same for each ABI. - 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 autotools-multilib_secure_install "${@}" |