gcc-config 1.5 dropped the -X option, thanks Leonid Volnitsky <leonid@volnitsky.com...

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

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 15b30749bfbed32180eda916c2405b3b963b36d7..94ca6a13781ccefe2a0c96bd5e9e3b8708d1d102 100644 (file)
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.46 2011/11/10 14:01:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.47 2011/11/14 15:02:31 voyageur Exp $
+
+  14 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> clang-2.8-r3.ebuild,
+  clang-2.9-r1.ebuild, clang-3.0_rc3.ebuild, clang-9999.ebuild:
+  gcc-config 1.5 dropped the -X option, thanks Leonid Volnitsky
+  <leonid@volnitsky.com> in bug #388621
 
   10 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> clang-3.0_rc3.ebuild:
   Fix tests (needs full compilation of llvm, remove broken test)

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 3ca49f463cefdc597ac9aae1ae11290e2dc43223..ae716889086a3b01b0a1e3f96443af2713b2a3da 100644 (file)
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -14,16 +14,16 @@ DIST clang-3.0rc3.src.tar.gz 7235549 RMD160 79544e26400858b8cade18b25f5b9df6b1dd
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
 DIST llvm-3.0rc3.src.tar.gz 10348810 RMD160 971ce6ed7c242827a8c02af7248f6305b1624bd3 SHA1 268025875ee738adaf1d45c3a2627f7c6e0b8272 SHA256 273b3a4fb3608b2373680af48bf083253e51a7ef52456034f6542460c0edac18
-EBUILD clang-2.8-r3.ebuild 6797 RMD160 ecb174c3026addd2435661bdcca680d27c8f0ccc SHA1 068109d69dc0abc43d3ec57c010028cf273cd0ff SHA256 e1039d4fce36749d5c1aee7e1a95ebcc9a45f1ca2ace4070fd33eac32ae52382
-EBUILD clang-2.9-r1.ebuild 6460 RMD160 56389cfa3a9d277c63a0cbf4e96781d331fa30f3 SHA1 8250c053ee1f802d8dc7cba02f9d6139910767bf SHA256 2891bc50c715d38060a5ea4bff21a83ccc90fa335490831adb264fd2308c55a7
-EBUILD clang-3.0_rc3.ebuild 6241 RMD160 d873b1a4af109d06f8b6a33e81a72f427aa2548a SHA1 0652a323215f8ba221fbe6b4d76585f69853ad66 SHA256 dbbbbe53ebdfb3596b13c16b08e6f19ed9d0d7cf6a8e65a7a242e879bc94bb76
-EBUILD clang-9999.ebuild 5888 RMD160 a1a1004f042815201f528c311c3408ef02219c8e SHA1 a34cdd2f5c012166b8fe839256e1f435ff3ceb21 SHA256 4ffbffb7f9792ef551db71a0ebb5195af80d4b0656d2fb73e461cfd7030b5a7f
-MISC ChangeLog 8709 RMD160 8633d2d171ab4a4df1ed6cb44fa7326f79380c5f SHA1 a8adaeeb2051fba26e3ebb6e448e6b87343c236b SHA256 2e90d42a740f108c427e8bdc19492eb4ddd6da5016a8affffec53f8cd133e57c
+EBUILD clang-2.8-r3.ebuild 6768 RMD160 7b552f45bca12124fe5659a9d3690b60706d14cb SHA1 c3b42800e461cda5852961f912e4ac0609062e0c SHA256 604b2964d566197adda982e6c1e6cdcc3365596ccfabadafe60e316049edabd7
+EBUILD clang-2.9-r1.ebuild 6431 RMD160 cb9ed182675f9a76beb2caa0fc1fe26bfc534dd9 SHA1 1a7a912396c7d1823cd1867bb4be9679a31b2c0e SHA256 f9993c92ea46a43debdf55563b70093530e1eabebcee270c01e4d0e3b9490d1a
+EBUILD clang-3.0_rc3.ebuild 6212 RMD160 085f3b45ca90b56a96e1a050ee5a43acab579bcc SHA1 727c6afe76c75900916c8c13353965a8b138b399 SHA256 749a52088cee115e567bb37d863144e62236e26f032f0ceda3d7220090b711b0
+EBUILD clang-9999.ebuild 5859 RMD160 883a9403292c93dc89bf4c1795f5b63ea7b6e235 SHA1 aa3d74416dccf67c0e4fa1d4cba981c63f06a33b SHA256 190c26c8c23e5a2d6230843512fa1438efc7acd04d99418393ebb7b1ee32ba55
+MISC ChangeLog 8954 RMD160 a01da67782b3fe3950a5bdd26db0728330945af9 SHA1 9494bd2980a69008829a7112c6cb3988640a55a4 SHA256 edb41650d16481580c10739d6bf03a654b0eb02a36525225d8b65b35b60c18e4
 MISC metadata.xml 1339 RMD160 5f8b76cda96fc95f67fd8ff7f977c116a4f0f28a SHA1 034f922ae098216b179e9d5c78246f9caa95b9d6 SHA256 0ef2f9bcc4f3293dcb69b2c882b93737b9be496e6f8789efa69df6adb2c1edf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk672VAACgkQFYEBGcdFJfJwbwD/THFLApdmybbn4wFvQfiduaMA
-HVxuvrqsd1mQ3vqOikwA/179BZbywaUsP8KvBUK3pFAy6oh29r2ia29R3NjjHOQT
-=GjoA
+iF4EAREIAAYFAk7BLZQACgkQFYEBGcdFJfJilAEAqlHUc3FcSQlHdOUEBxUc0pYm
+LjohC7BRon4mrTsGxF8A/ipQR8ZIPTD22dGYvgdj+37cArYQd8GfPG/V/UCDZlF1
+=ieZG
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/clang/clang-2.8-r3.ebuild b/sys-devel/clang/clang-2.8-r3.ebuild
index d624806ed157c442bd5c184f455b150a94d82c23..62e21b48842fb70b28722645126af4477734de08 100644 (file)
--- a/sys-devel/clang/clang-2.8-r3.ebuild
+++ b/sys-devel/clang/clang-2.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.8-r3.ebuild,v 1.6 2011/10/04 11:52:07 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.8-r3.ebuild,v 1.7 2011/11/14 15:02:31 voyageur Exp $
 
 EAPI=3
 
@@ -109,7 +109,7 @@ src_configure() {
 
        if use system-cxx-headers; then
                # Try to get current gcc headers path
-               local CXX_PATH=$(gcc-config -X| cut -d: -f1 | sed 's,/include/g++-v4$,,')
+               local CXX_PATH=$(gcc-config -L| cut -d: -f1)
                CONF_FLAGS="${CONF_FLAGS} --with-c-include-dirs=/usr/include:${CXX_PATH}/include"
                CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=${CXX_PATH}/include/g++-v4"
                CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST"

diff --git a/sys-devel/clang/clang-2.9-r1.ebuild b/sys-devel/clang/clang-2.9-r1.ebuild
index 20f097524d11d355f4932b0e72772402f051c234..268435edbc72113e44c350dce8f01d04773943d6 100644 (file)
--- a/sys-devel/clang/clang-2.9-r1.ebuild
+++ b/sys-devel/clang/clang-2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.9-r1.ebuild,v 1.3 2011/10/04 11:52:07 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.9-r1.ebuild,v 1.4 2011/11/14 15:02:31 voyageur Exp $
 
 EAPI=3
 
@@ -98,7 +98,7 @@ src_configure() {
 
        if use system-cxx-headers; then
                # Try to get current gcc headers path
-               local CXX_PATH=$(gcc-config -X| cut -d: -f1 | sed 's,/include/g++-v4$,,')
+               local CXX_PATH=$(gcc-config -L| cut -d: -f1)
                CONF_FLAGS="${CONF_FLAGS} --with-c-include-dirs=/usr/include:${CXX_PATH}/include"
                CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=${CXX_PATH}/include/g++-v4"
                CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST"

diff --git a/sys-devel/clang/clang-3.0_rc3.ebuild b/sys-devel/clang/clang-3.0_rc3.ebuild
index d98bb9a42c230401bc4b9858facf03a42c5603e6..4e1be4e36b1f622b7997d39732d3d643a4e4b80b 100644 (file)
--- a/sys-devel/clang/clang-3.0_rc3.ebuild
+++ b/sys-devel/clang/clang-3.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0_rc3.ebuild,v 1.2 2011/11/10 14:01:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0_rc3.ebuild,v 1.3 2011/11/14 15:02:31 voyageur Exp $
 
 EAPI=3
 
@@ -86,7 +86,7 @@ src_configure() {
 
        if use system-cxx-headers; then
                # Try to get current gcc headers path
-               local CXX_PATH=$(gcc-config -X| cut -d: -f1 | sed 's,/include/g++-v4$,,')
+               local CXX_PATH=$(gcc-config -L| cut -d: -f1)
                CONF_FLAGS="${CONF_FLAGS} --with-c-include-dirs=/usr/include:${CXX_PATH}/include"
                CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=${CXX_PATH}/include/g++-v4"
                CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST"

diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 54834c843b83a8f32995af215aec3aa6910f4d6a..b5fc4a8aaddd1c2b5dadce21910564b6b13c6749 100644 (file)
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.19 2011/11/09 22:55:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.20 2011/11/14 15:02:31 voyageur Exp $
 
 EAPI=3
 
@@ -88,7 +88,7 @@ src_configure() {
 
        if use system-cxx-headers; then
                # Try to get current gcc headers path
-               local CXX_PATH=$(gcc-config -X| cut -d: -f1 | sed 's,/include/g++-v4$,,')
+               local CXX_PATH=$(gcc-config -L| cut -d: -f1)
                CONF_FLAGS="${CONF_FLAGS} --with-c-include-dirs=/usr/include:${CXX_PATH}/include"
                CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=${CXX_PATH}/include/g++-v4"
                CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST"