clang now autodetects C++ header paths, dropping the system-cxx-headers system and fixing bug #402365

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

3 files changed, 18 insertions, 36 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 45f7da09cf53..22a2878dde46 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.53 2012/02/16 11:35:09 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.54 2012/02/16 14:47:35 voyageur Exp $
+
+  16 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> clang-9999.ebuild:
+  clang now autodetects C++ header paths, dropping the system-cxx-headers
+  system and fixing bug #402365
 
 *clang-3.0-r3 (16 Feb 2012)
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index c227ccccd11b..91492079b738 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -19,13 +19,13 @@ DIST llvm-3.0.tar.gz 10350539 RMD160 85211cafbed1c5d838ac54669017b5298613f975 SH
 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-r3.ebuild 6484 RMD160 d138ec46bd11104b6e1146c4e792573ead6155d3 SHA1 a3b0fd3ed77a50380378d2766fd145a05549ea1f SHA256 21e95a3dc66e137baf9334f3b614259bacb241aa73a921bb492fc337ce6a446e
-EBUILD clang-9999.ebuild 6209 RMD160 772b2786b56b295faa3905c4c525ef630165229b SHA1 20320b8901614d855826edd27958345e2931066e SHA256 636526217b24cdb4d93e96311b770126449635b3c40816fd170ee36ebaaca825
-MISC ChangeLog 10174 RMD160 ea42ed8ae91a2a84efbaaff616b71659f94f79a9 SHA1 112cfff2d3bbfec6955021a1fe4730ce215baeb8 SHA256 cbcf692f52d0cc1ef05def2576ca52a5267e4ae1a0b3443ff604b4af9c74f4d6
+EBUILD clang-9999.ebuild 5086 RMD160 9d6c30cfca127174a551b2c00bed8fe47ccd1487 SHA1 fba91e279e45ed1b5c358875174ada1c9b2435d3 SHA256 91ce9818edcf7eaaa8026985dadc5f4c2318d3e5cfbc093856ca3f4ef7fe1727
+MISC ChangeLog 10355 RMD160 d14a340b70a55ec0c733e4278f3d14786443978e SHA1 c94b6825e02b377e10e9129572c88b4742148629 SHA256 aac97bffa393e86013ad5af79410d9ab87bc9fc2e37d483417a178684ea29fa3
 MISC metadata.xml 1339 RMD160 5f8b76cda96fc95f67fd8ff7f977c116a4f0f28a SHA1 034f922ae098216b179e9d5c78246f9caa95b9d6 SHA256 0ef2f9bcc4f3293dcb69b2c882b93737b9be496e6f8789efa69df6adb2c1edf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk886fkACgkQFYEBGcdFJfKwbAD/RLFMPksxQVTiG978iiSq53U7
-jwUQ1o6UTmH4rKFVItUA/jzbyALJOxPvBOur/56iuCKvV6HzhXzVh/lnRQSnYrI0
-=ZdoC
+iF4EAREIAAYFAk89FxcACgkQFYEBGcdFJfLZcQD+NGxzEwb2NyXn9vwbD1F2zhrD
+GwbcdXNvVzwv+bsx9TYBAIc1jRBeWSHEVesuceFuBy07IXZnl9gYxo/oqQ3TsudD
+=TGmM
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 297d9cb8e5af..5fe6b1faedd3 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.23 2012/02/03 14:29:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.24 2012/02/16 14:47:35 voyageur Exp $
 
-EAPI=3
+EAPI=4
 
 RESTRICT_PYTHON_ABIS="3.*"
 SUPPORT_PYTHON_ABIS="1"
@@ -17,7 +17,7 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/cfe/trunk"
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug multitarget +static-analyzer +system-cxx-headers test"
+IUSE="debug multitarget +static-analyzer test"
 
 DEPEND="static-analyzer? ( dev-lang/perl )"
 RDEPEND="~sys-devel/llvm-${PV}[multitarget=]"
@@ -32,14 +32,12 @@ src_unpack() {
 
 src_prepare() {
 	# Same as llvm doc patches
-#	epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch
+	epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch
 
 	# multilib-strict
 	sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \
 		-i tools/clang/lib/Headers/Makefile \
 		|| die "clang Makefile failed"
-	# Fix cxx_include_root path for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.1-fix_cxx_include_root.patch
 	# fix the static analyzer for in-tree install
 	sed -e 's/import ScanView/from clang \0/'  \
 		-i tools/clang/tools/scan-view/scan-view \
@@ -94,27 +92,16 @@ src_configure() {
 		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
 	fi
 
-	if use system-cxx-headers; then
-		# Try to get current gcc headers path
-		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"
-		if has_multilib_profile; then
-			CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-32bit-dir=32"
-		fi
-	fi
-
-	econf ${CONF_FLAGS} || die "econf failed"
+	econf ${CONF_FLAGS}
 }
 
 src_compile() {
-	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only || die "emake failed"
+	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only
 }
 
 src_test() {
 	cd "${S}"/test || die "cd failed"
-	emake site.exp || die "updating llvm site.exp failed"
+	emake site.exp
 
 	cd "${S}"/tools/clang || die "cd clang failed"
 
@@ -127,7 +114,7 @@ src_test() {
 
 src_install() {
 	cd "${S}"/tools/clang || die "cd clang failed"
-	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
+	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install
 
 	if use static-analyzer ; then
 		dobin tools/scan-build/ccc-analyzer
@@ -174,15 +161,6 @@ src_install() {
 
 pkg_postinst() {
 	python_mod_optimize clang
-	if use system-cxx-headers; then
-		elog "C++ headers search path is hardcoded to the active gcc profile one"
-		elog "If you change the active gcc profile, or update gcc to a new version,"
-		elog "you will have to remerge this package to update the search path"
-	else
-		elog "If clang++ fails to find C++ headers on your system,"
-		elog "you can remerge clang with USE=system-cxx-headers to use C++ headers"
-		elog "from the active gcc profile"
-	fi
 }
 
 pkg_postrm() {