diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-05-09 06:51:21 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-05-09 06:51:21 +0000 |
| commit | 90a867d8141f4c2933c81d402aaaa02344a3376e (patch) | |
| tree | b9d1efc54b0e94e15147f5cf92b23979a0d74c38 /eclass | |
| parent | Version bump. (diff) | |
| download | gentoo-2-90a867d8141f4c2933c81d402aaaa02344a3376e.tar.gz gentoo-2-90a867d8141f4c2933c81d402aaaa02344a3376e.tar.bz2 gentoo-2-90a867d8141f4c2933c81d402aaaa02344a3376e.zip | |
Remove wrapped headers with USE=abi_x86_32.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/emul-linux-x86.eclass | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d7a33b78f537..51d09c982b61 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.1245 2014/05/08 21:39:34 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1246 2014/05/09 06:51:21 mgorny Exp $ + + 09 May 2014; Michał Górny <mgorny@gentoo.org> emul-linux-x86.eclass: + Remove wrapped headers with USE=abi_x86_32. 08 May 2014; Pacho Ramos <pacho@gentoo.org> emul-linux-x86.eclass: Previous approach was wrong diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass index 1d5461adbf32..3d7d66b1ed3c 100644 --- a/eclass/emul-linux-x86.eclass +++ b/eclass/emul-linux-x86.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/emul-linux-x86.eclass,v 1.22 2014/05/08 21:39:34 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.23 2014/05/09 06:51:21 mgorny Exp $ # # Original Author: Mike Doty <kingtaco@gentoo.org> @@ -82,4 +82,11 @@ emul-linux-x86_src_install() { popd >/dev/null fi + + # Since header wrapping is added as part of gx86-multilib support, + # all packages involved install their own copies of i686* headers + # when built with abi_x86_32. + if [[ -d "${D}"/usr/include ]] && use abi_x86_32; then + rm -r "${D}"/usr/include || die + fi } |