Set includedir to /usr/$CTARGET for cross-compilers #400729 by Karsten Steingaß.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 32 insertions, 21 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 61640fa24026..de839751d20f 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.208 2012/01/25 19:31:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.209 2012/01/25 22:28:00 vapier Exp $
+
+  25 Jan 2012; Mike Frysinger <vapier@gentoo.org> gdb-7.4.ebuild,
+  gdb-9999.ebuild:
+  Set includedir to /usr/$CTARGET for cross-compilers #400729 by Karsten
+  Steingaß.
 
   25 Jan 2012; Mike Frysinger <vapier@gentoo.org> gdb-7.4.ebuild,
   gdb-9999.ebuild:
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 01e2c72cf738..30fb3c52f168 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -32,24 +32,24 @@ EBUILD gdb-7.2.ebuild 3498 RMD160 97d6ae6747660a07b8587d1c9bd92d99fb4261b4 SHA1
 EBUILD gdb-7.3.1-r1.ebuild 5137 RMD160 371e54c475bc62420c510f2b66b9f8e38ac10812 SHA1 98a18fba1de23462afab4f379eec5ba8f6d29290 SHA256 dad0ce923b3bd5b97facbfabeb6c80dea2e055b216ea2a649e9a87cb6ca928e6
 EBUILD gdb-7.3.1.ebuild 3888 RMD160 96974bafb2434a05c3a552384fe861215567d6cd SHA1 93eefb1f8841775bffd24a08ac4953ebf17790bc SHA256 926218f81698c60c724ecd87c927fd9e0256365642f9d827f8f15ea4f236a7b4
 EBUILD gdb-7.3.ebuild 3801 RMD160 59f24f3a7276a440fc4162863d52706febadea9b SHA1 a0a4aa9d51c7e5396d53e40536117b6c86277c30 SHA256 69aa29131061561ec60165e2f65e74a897ae2a5f51799ddce2c048a7a6606855
-EBUILD gdb-7.4.ebuild 5149 RMD160 cab8eaac3fdbfc35e6311bdd920114ce33c8b556 SHA1 5038be995279c6ea8657044f8bc57d2e56c96442 SHA256 4d44ecbf1db1f32d02f8e977b633255381b37e524a13f3e257676aeec9c7cce5
-EBUILD gdb-9999.ebuild 5149 RMD160 1b29620484879bca16f40aa4dcc13b26d8554269 SHA1 0c09093f5f997b877247b7b5db829413f678ab37 SHA256 3310465c1b094def75c364e8fe3cd2186438036d3058ded5684a491b0d0a68f1
-MISC ChangeLog 27753 RMD160 8d4d7c6ed048c8d3efe16d691b727486b115d09a SHA1 42d2cf5cbbe6984f22ba955333b35e96a701f527 SHA256 0c870928043d38526733b4501506adb2b5e7a53903ec50b5e239d4998f11752c
+EBUILD gdb-7.4.ebuild 5225 RMD160 c0790d22daedd742c4bf7623cb1d6c5c38d07465 SHA1 68ab7f514bc072415ce758ba49bf6195db8451cd SHA256 2fff7e870451c4f38f8362c6b054738145cd3fdd1e2799c154b58d41102dc5e6
+EBUILD gdb-9999.ebuild 5226 RMD160 e4d60b4db31b518536a2c6a50981ee6508a204c9 SHA1 0c500ecc2e5401497d158264d2ea48604483a945 SHA256 0d17f76f5d064d0979a0379086e697afd0c039fd03bf1c365684fb60516c4b79
+MISC ChangeLog 27925 RMD160 b4dd6e669ba0c4b4306560d2ef66ddab1c2d3c4b SHA1 9c74838c32d4292e1f8c4fa0c9932c2e0b6d779a SHA256 7b0fa1fadb3c11428c519e9d388d9eaa37d57f0e3e14d2a690ad3b43ecaf8378
 MISC metadata.xml 552 RMD160 05c46fb5af7dc382b5977a47dac90f077ddf7b68 SHA1 2aab7d540d4b18a618bf34d962c63ae9f7e18aed SHA256 e86791dadf315a7a079e460854bcc4a28d7c69a93694efc85014b325824b81cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPIFjRAAoJELEHsLL7fEFW1moP/0m0n1q10HnvGWMsAN8NZafu
-l+5N30EkY19mzgWjVYWalleismiIOAAPXc2TugRH407t1oXiM1PSZnsPY3BFxaz8
-g/ah7RfDqjdmwyVHkNftJ3aXcJCpXN38tELtsEffgCZwsIIEC1OgwGeiABBplLxm
-VeNlWi8W3rtujDAtj5BbW6Pndi0/GPCz0Hx8pymy7y4YQ3YjjsgKa/8nXHbMEzxe
-nahCgo9hib6OUHV2a/oKvpEKH7WXZLe2OFDi1mkZ7C9ScknyBfFkvU1virsChhGk
-tKDFJQKSQUSVbb56Vhhfl9ZtBfXBWYNP4xuxuuD8HICGibI+YeuzXKccTMl8tz+H
-KQ4IywUy+kcWGuv1h7ghfn2di+aV4M+fBcUzMBDau3KtmAnuemcYn15EgS2L2IJ+
-B3czcGBmF8DCZrtzKtbwuvMpeTZsrZExAaQb0jmb7oNSwpVdhWGkp6ZJ/w+HaTSj
-dGROvpCsRsRcNinR96Dy1MNHvu2xD3j6Wjw2dlrRMf8fP18mTCe9Dz4lxLjqoRj6
-xlIW8wcdLGdN7qeWjIK6atoi1YPaLe1bmp9a0QYkSEFlPleQApH8kkjtqHSDPh+O
-I5I070t2Q6hsLsD+wn8KLGvoRkZLeEGWd/vle/VUZSyeYo0f5wm/sz7GLPqJ8BpX
-goZoa5K5A1sbg0gQ5HeC
-=pGek
+iQIcBAEBAgAGBQJPIIIkAAoJELEHsLL7fEFWZ1cP/ib7pumn8X9N1DNmVPpFqidG
+/zKY1KzaaSOcpSKvzP9EFt+FUp2S4oztgZoJQTKjlN3rvNIA6lL8XKocoH7LOJ1w
+DwMl4GzxFy5OOHA19MWbWd7EC3FsNB+MSmnGJZUydhU3vdOgDGFcTAbf8mZAZJU8
+YgJTKLvVWt9PnoRuzp69GsjADl80KX+YZcekXWbdaJ+NsSYDgJVoOH2laZiJOGsi
+ohL2NPRkoerALqiZmGeHCPJAt1sUZIsl47HI98KQrHEQgTD8GFqoTpTrv68plsf7
+uIL6qOJefWb1scemHwb61N7Y+viiClXXhS4DHoiNBNR6jnYUo06ohEJ80IuMHEv5
+1dgIqc2Q09kbDWMfMbTMPIKNDmED5sblbx3VOXto9QNViARZHornqxsuQM+5wcKs
+5R5/A1MVy0yesOD94OMNMV/fbom4X86mQm33xEQTRNxozcaYR3hpzqMM3h78RhWm
+GohfXLY85MfZD4SPgan8Ud65ogSILdzEW54HClI5FSt5pTUBHSafl6kpH5X6lFaV
+WmCBOEFUpvMJTcXKJWuaF49BBBlxYx1fq/I1xaPI6ASwqxZ51UpwCcIkHL2y6kWC
+KafvzPonzaEk6SOyAawdnsGyYSms0dWi1+h/6k73Wf9W8zHy/m7HXROw/9ngqktN
+CqnMoIWbAQLOCSTMPp34
+=DTHp
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-7.4.ebuild b/sys-devel/gdb/gdb-7.4.ebuild
index eb7bbe56c3cb..cbb5938f0a4b 100644
--- a/sys-devel/gdb/gdb-7.4.ebuild
+++ b/sys-devel/gdb/gdb-7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.4.ebuild,v 1.2 2012/01/25 19:31:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.4.ebuild,v 1.3 2012/01/25 22:28:00 vapier Exp $
 
 EAPI="3"
 
@@ -86,11 +86,14 @@ gdb_branding() {
 src_configure() {
 	strip-unsupported-flags
 
+	local sysroot="${EPREFIX}"/usr/${CTARGET}
 	local myconf=(
 		--with-pkgversion="$(gdb_branding)"
 		--with-bugurl='http://bugs.gentoo.org/'
 		--disable-werror
-		$(is_cross && echo --with-sysroot="${EPREFIX}"/usr/${CTARGET})
+		$(is_cross && echo \
+			--with-sysroot="${sysroot}" \
+			--includedir="${sysroot}/usr/include")
 	)
 
 	if use server && ! use client ; then
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index bd13cd3136ff..202c536f3cdd 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.9 2012/01/25 19:31:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.10 2012/01/25 22:28:00 vapier Exp $
 
 EAPI="3"
 
@@ -86,11 +86,14 @@ gdb_branding() {
 src_configure() {
 	strip-unsupported-flags
 
+	local sysroot="${EPREFIX}"/usr/${CTARGET}
 	local myconf=(
 		--with-pkgversion="$(gdb_branding)"
 		--with-bugurl='http://bugs.gentoo.org/'
 		--disable-werror
-		$(is_cross && echo --with-sysroot="${EPREFIX}"/usr/${CTARGET})
+		$(is_cross && echo \
+			--with-sysroot="${sysroot}" \
+			--includedir="${sysroot}/usr/include")
 	)
 
 	if use server && ! use client ; then