diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index ba060f26ab01..0121b61421bc 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1251 2014/05/12 11:53:28 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1252 2014/05/12 21:56:17 mgorny Exp $ + + 12 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: + Do not install wrapper headers when no ABI provides a particular header. 12 May 2014; Michael Palimaka <kensington@gentoo.org> -boost-utils.eclass, -office-ext.eclass: Remove last-rited eclasses. diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index fd5b89347b19..3e5b1ea50b24 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.47 2014/05/07 17:33:49 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.48 2014/05/12 21:56:17 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -414,10 +414,12 @@ multilib_prepare_wrappers() { local dir=${f%/*} - if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then - dodir "/tmp/multilib-include${dir}" - # a generic template - cat > "${ED}/tmp/multilib-include${f}" <<_EOF_ + # Some ABIs may have install less files than others. + if [[ -f ${root}/usr/include${f} ]]; then + if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then + dodir "/tmp/multilib-include${dir}" + # a generic template + cat > "${ED}/tmp/multilib-include${f}" <<_EOF_ /* This file is auto-generated by multilib-build.eclass * as a multilib-friendly wrapper. For the original content, * please see the files that are #included below. @@ -443,10 +445,8 @@ multilib_prepare_wrappers() { # error "No ABI matched, please report a bug to bugs.gentoo.org" #endif _EOF_ - fi + fi - # Some ABIs may have install less files than others. - if [[ -f ${root}/usr/include${f} ]]; then # $CHOST shall be set by multilib_toolchain_setup dodir "/tmp/multilib-include/${CHOST}${dir}" mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die |