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

[Michal Gorny (mgorny)]

mgorny      13/04/01 11:05:27

  Modified:             ChangeLog autotools-multilib.eclass
  Log:
  Fix path handling in header wrapping code.

Revision  Changes    Path
1.764                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.763
retrieving revision 1.764
diff -u -r1.763 -r1.764
--- ChangeLog	1 Apr 2013 09:18:57 -0000	1.763
+++ ChangeLog	1 Apr 2013 11:05:27 -0000	1.764
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.763 2013/04/01 09:18:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.764 2013/04/01 11:05:27 mgorny Exp $
+
+  01 Apr 2013; Michał Górny <mgorny@g.o> autotools-multilib.eclass:
+  Fix path handling in header wrapping code.
 
   01 Apr 2013; Michał Górny <mgorny@g.o> autotools-multilib.eclass:
   Support wrapping headers for multilib.



1.14                 eclass/autotools-multilib.eclass

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

Index: autotools-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- autotools-multilib.eclass	1 Apr 2013 09:18:57 -0000	1.13
+++ autotools-multilib.eclass	1 Apr 2013 11:05:27 -0000	1.14
@@ -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.13 2013/04/01 09:18:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.14 2013/04/01 11:05:27 mgorny Exp $
 
 # @ECLASS: autotools-multilib.eclass
 # @MAINTAINER:
@@ -83,18 +83,18 @@
 			die "Wrapping headers outside of /usr/include is not supported at the moment."
 		fi
 		# and then usr/include
-		f=${f#usr/include/}
+		f=${f#usr/include}
 
 		local dir=${f%/*}
 
 		# $CHOST shall be set by multilib_toolchain_setup
-		dodir "/tmp/multilib-include/${CHOST}/${dir}"
-		mv "${ED}/usr/include/${f}" "${ED}/tmp/multilib-include/${CHOST}/${dir}/" || die
+		dodir "/tmp/multilib-include/${CHOST}${dir}"
+		mv "${ED}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die
 
-		if [[ ! -f ${ED}/tmp/multilib-include/${f} ]]; then
-			dodir "/tmp/multilib-include/${dir}"
+		if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
+			dodir "/tmp/multilib-include${dir}"
 			# a generic template
-			cat > "${ED}/tmp/multilib-include/${f}" <<_EOF_ || die
+			cat > "${ED}/tmp/multilib-include${f}" <<_EOF_ || die
 /* This file is auto-generated by autotools-multilib.eclass
  * as a multilib-friendly wrapper. For the original content,
  * please see the files that are #included below.
@@ -129,7 +129,7 @@
 
 		# Note: match a space afterwards to avoid collision potential.
 		sed -e "/${abi_flag} /s&error.*&include <${CHOST}/${f}>&" \
-			-i "${ED}/tmp/multilib-include/${f}" || die
+			-i "${ED}/tmp/multilib-include${f}" || die
 	done
 }