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 | 91c583c613d0bbe763d719dc597e262bdc36e2c1 (patch) | |
| tree | 518c5dc8ffef93425b5057bc46ccc2483b1edbd5 /eclass | |
| parent | fix cross compilation (diff) | |
| download | historical-91c583c613d0bbe763d719dc597e262bdc36e2c1.tar.gz historical-91c583c613d0bbe763d719dc597e262bdc36e2c1.tar.bz2 historical-91c583c613d0bbe763d719dc597e262bdc36e2c1.zip | |
Disable trying (and failing) to wrap headers when multilib is disabled, bug #474920.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/autotools-multilib.eclass | 11 | ||||
| -rw-r--r-- | eclass/multilib-minimal.eclass | 9 |
3 files changed, 19 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 1ba0eee468e9..0c020ae7249c 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.865 2013/06/28 02:37:52 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.866 2013/06/28 12:42:48 mgorny Exp $ + + 28 Jun 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass, + multilib-minimal.eclass: + Disable trying (and failing) to wrap headers when multilib is disabled, bug + #474920. 28 Jun 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Fix redundant slashes in header-wrapping include paths, bug #475046. Thanks 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 "${@}" diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index 277ea8a20e54..d4c3cbd07f1e 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.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/multilib-minimal.eclass,v 1.4 2013/06/17 19:13:17 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.5 2013/06/28 12:42:48 mgorny Exp $ # @ECLASS: multilib-minimal.eclass # @MAINTAINER: @@ -92,8 +92,11 @@ multilib-minimal_src_install() { emake DESTDIR="${D}" install fi fi - multilib_prepare_wrappers - multilib_check_headers + # Do multilib magic only when >1 ABI is used. + if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then + multilib_prepare_wrappers + multilib_check_headers + fi popd >/dev/null || die } multilib_foreach_abi multilib-minimal_abi_src_install |