Update live ebuild to sync latest ebuild changes, fixes bug #369027

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

3 files changed, 31 insertions, 10 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 16ff1646b9cd..512669029de4 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,9 @@
 # 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.37 2011/04/22 11:10:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.38 2011/06/06 19:40:25 voyageur Exp $
+
+  06 Jun 2011; Bernard Cafarelli <voyageur@gentoo.org> clang-9999.ebuild:
+  Update live ebuild to sync latest ebuild changes, fixes bug #369027
 
   21 Apr 2011; Fabian Groffen <grobian@gentoo.org> clang-2.9.ebuild:
   Update install_name reference to libLLVM
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 4e978393232a..4c01286be88d 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX clang-2.7-fixdoc.patch 1977 RMD160 62f52e5580baa396d93c56735c0039c8691b43b6 SHA1 351c1d2cf86b6da75a6ed19083d7a857333f007c SHA256 36c2214e575ed3fd78938279739e82c4f750f8726f8387e1414c18532501314a
 AUX clang-2.8-alignof.patch 11984 RMD160 3ddf038274481a325ced3a736a5109302d0c50b5 SHA1 7d040a7d2d54e64b85cd2ac188d151d8b89fc62a SHA256 2c1d648c64cc6582a00b0adbc5c65e3ac89a1bb1816e0691902866730a332fa2
 AUX clang-2.8-darwin-prefix.patch 4989 RMD160 e2c863f62b6f9ef3b26b9b2a41cfd9950fb174b4 SHA1 dfda0f3d1f9bac791ed7fb0c06d8c91e931a8fd5 SHA256 808d6d47b7eb133a4e1091bf24b64690fe14d3f5b66fec7a9ed3d91aeb1f03d7
@@ -9,6 +12,13 @@ DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
 EBUILD clang-2.8-r3.ebuild 6703 RMD160 ff13629864029c389c8ff8d508e87b2a8aafc2bb SHA1 52fae48bb0c9a49e7438e2d71d26e88183f1cc11 SHA256 9c23072cbbb6e8b41ffcdd5a01e4757eab93755b141571c689e3994c74cd4608
 EBUILD clang-2.9.ebuild 6509 RMD160 e3e33a32975723ddac1bdb3db48a1aa7e943d8ed SHA1 2bf912b78d1a6aa819cb021974633a84054d897d SHA256 2f0907d29367a3a4bf22acd440bfc01fbf112a6dfebb1b51a61260060dfce7b2
-EBUILD clang-9999.ebuild 5862 RMD160 7f5850651f443ec5097770bcb546645047598ebf SHA1 53a0e815590a09144b00e4d1181710263f7b579a SHA256 63de56fa05b70424f2245936c46361061bf6a0dfd6f39e099919acb4a6b292b9
-MISC ChangeLog 6840 RMD160 2bad4a4a8702bb03dc6274ce51620a8dcd14b68e SHA1 c4f50372b9a40a9887f651b3603f30e43f38366c SHA256 e2c8b05a3effd2dc19665dd82ee8bac2c389b0d4e660fee7a515a168291b5721
+EBUILD clang-9999.ebuild 6171 RMD160 24e9ea0bd94673a12b805c1b0276cf94c8119484 SHA1 2e9e1f380848a5bbd6e9cada81ef71d74610adc4 SHA256 f650bff5932b6eee37ae9b14ede0aed0111fa50290c7caa5efa1b1851e1a2e34
+MISC ChangeLog 6986 RMD160 46311a798eb4549c23e93e7441676d125f2536ca SHA1 174af5f45485579a05e7660da26c170b26e2d05c SHA256 36b18acfc5b2ee092966dccedb00da950c19a14019ac2bdcd5482c44c4709d3f
 MISC metadata.xml 1360 RMD160 73b894c5108dd5d2d3b49f82353920da7f2adc4c SHA1 6808434002d0109de4ef8f52ad4a9cc4f4a2fbfc SHA256 14c80bf0afbebde4ec5bc2332865762d3dcd98db842cf52fc78617b4889dae38
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk3tLTUACgkQFYEBGcdFJfKNKgD/atlYqQzfVTA/0Ssdk2PHV6dG
+hSxklUFXXtQi3wIjfUYBAIex8B4Frhu2aHrJECNHp59YBGAnhIWUZaQyRXp9K/0f
+=cUp2
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index a3db73f175d0..1d0362d73149 100644
--- 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.12 2011/01/26 17:48:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.13 2011/06/06 19:40:25 voyageur Exp $
 
 EAPI=3
 
@@ -17,11 +17,11 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/cfe/trunk"
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug +static-analyzer system-cxx-headers test"
+IUSE="alltargets debug +static-analyzer system-cxx-headers test"
 
 # Note: for LTO support, clang will depend on binutils with gold plugins, and LLVM built after that - http://llvm.org/docs/GoldPlugin.html
 DEPEND="static-analyzer? ( dev-lang/perl )"
-RDEPEND="~sys-devel/llvm-${PV}"
+RDEPEND="~sys-devel/llvm-${PV}[alltargets=]"
 
 S="${WORKDIR}/llvm"
 
@@ -62,7 +62,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local CONF_FLAGS=""
+	local CONF_FLAGS="--enable-shared"
 
 	if use debug; then
 		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
@@ -81,6 +81,12 @@ src_configure() {
 			--with-c-include-dirs=${EPREFIX}/usr/include:/usr/include"
 	fi
 
+	if use alltargets; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
+	else
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
+	fi
+
 	if use amd64; then
 		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
 	fi
@@ -89,8 +95,10 @@ src_configure() {
 	CONF_FLAGS="${CONF_FLAGS} --with-llvmgccdir=/dev/null"
 
 	if use system-cxx-headers; then
-		# Try to get current C++ headers path
-		CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=$(gcc-config -X| cut -d: -f1 | sed '/-v4$/! s,$,/include/g++-v4,')"
+		# Try to get current gcc headers path
+		local CXX_PATH=$(gcc-config -X| cut -d: -f1 | sed 's,/include/g++-v4$,,')
+		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"
@@ -154,7 +162,7 @@ src_install() {
 			install_name_tool \
 				-change "@rpath/libclang.dylib" \
 					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
-				-change "${S}"/Release/lib/libLLVM-${PV}.dylib \
+				-change "@executable_path/../lib/libLLVM-${PV}.dylib" \
 					"${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \
 				-change "${S}"/Release/lib/libclang.dylib \
 					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \