[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      14/05/12 21:56:17

  Modified:             ChangeLog multilib-build.eclass
  Log:
  Do not install wrapper headers when no ABI provides a particular header.

Revision  Changes    Path
1.1252               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1252&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1252&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1251&r2=1.1252

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1251
retrieving revision 1.1252
diff -u -r1.1251 -r1.1252
--- ChangeLog	12 May 2014 11:53:28 -0000	1.1251
+++ ChangeLog	12 May 2014 21:56:17 -0000	1.1252
@@ -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.



1.48                 eclass/multilib-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.47&r2=1.48

Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- multilib-build.eclass	7 May 2014 17:33:49 -0000	1.47
+++ multilib-build.eclass	12 May 2014 21:56:17 -0000	1.48
@@ -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 @@
 
 				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 @@
 #	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