Add support for gold plugin, thanks Matthias Maier in bug #371951

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

4 files changed, 24 insertions, 11 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 37a41a4be453..ccfe7217efe9 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.50 2011/11/17 18:50:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.51 2011/11/22 13:42:23 voyageur Exp $
+
+  22 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.0_rc3.ebuild,
+  metadata.xml:
+  Add support for gold plugin, thanks Matthias Maier in bug #371951
 
   17 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> llvm-2.9-r2.ebuild:
   x86 stable wrt bug #384709
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 0a49307f0aac..ce00fcd003ae 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX llvm-2.6-commandguide-nops.patch 975 RMD160 1178c27a8845c2c86d6d381ba3d95b4b9b627f1e SHA1 41b9d8c3ae0ed1023ec72bf629c53fa8981e0264 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649
 AUX llvm-2.7-nodoctargz.patch 1878 RMD160 a6134fd292a1a2c6a594e787ce73b15012be04bb SHA1 9d32a0e15791789d8bf58dfecf9580a00d150319 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd
@@ -12,14 +12,14 @@ DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 5
 DIST llvm-3.0rc3.src.tar.gz 10348810 RMD160 971ce6ed7c242827a8c02af7248f6305b1624bd3 SHA1 268025875ee738adaf1d45c3a2627f7c6e0b8272 SHA256 273b3a4fb3608b2373680af48bf083253e51a7ef52456034f6542460c0edac18
 EBUILD llvm-2.8-r2.ebuild 6156 RMD160 9e76bf90d103993330bcf8701c8ee490117c3ab1 SHA1 f691fe35a6a02da441fd9aa1c52a04a2aff298a9 SHA256 9bc669e88d0a49b5fa7c5ada8da9752cade9876fb03bb16cbad1afebee507d1b
 EBUILD llvm-2.9-r2.ebuild 6115 RMD160 d36d9ab00ea269e431bfcd08468a0304211da9ea SHA1 2e41c1a449f79160dd21e9f1a1a8ae6ef3fd7b2b SHA256 fa97ce98ffe1b1e5231b4f164522d1fc4099fcc8e7a137958bb4ae1ac46ddfe8
-EBUILD llvm-3.0_rc3.ebuild 5049 RMD160 cf55450bd9bd812dc6ecd28163faf8d4c21cd968 SHA1 2c24b8aaca23c42de8be49d8679f511515198c7e SHA256 eb42a36b2d681007aa5183414797311f981e988ee12cb835229ddab18b684bd3
+EBUILD llvm-3.0_rc3.ebuild 5341 RMD160 81fd0f18fab6faa33bf4c0114bc55165e40694ea SHA1 c64014d5293edbea8a39fdf9219c50e199efda73 SHA256 dc458ac52cd7efaaaea78e6b860e39bcc6e90576adcd5c719e8f223a8fda6860
 EBUILD llvm-9999.ebuild 4974 RMD160 8956e441647bfa6cf3bf15960fd7124cd8e90d28 SHA1 f0d7c502087051edb3b311f15376aace0c357f5c SHA256 080fe2ecb218c0bae613e8031f6cfb50b3fc191bfa9216d244c56432cbb36cf6
-MISC ChangeLog 8325 RMD160 6393734996622f0c5a6f434eb1cf33001908aed2 SHA1 70dec492c4f3af9a765f1ae63bd329df81d915c3 SHA256 e2e169b6722364919bf055701dc5dae79f4e523c2d74092ab5d60d33df801a8b
-MISC metadata.xml 2234 RMD160 b14138857d612a9f5568760b1e70b80f344d978c SHA1 53d1e496b0e80e9acc24fd1cb8858e9efc93d7c0 SHA256 83a322d633e38210fe9946ea92902a17142863fe26578bb1b1bad773952b0419
+MISC ChangeLog 8484 RMD160 11cd2d2bdb2da00a09bbc2f220cb714a4a514b75 SHA1 ece9291a34346e209d134eb3724b1e71164896dd SHA256 ae260070ea05271368882f38723fcc75e6bb487835154483ed7109d1ddb99453
+MISC metadata.xml 2290 RMD160 3c36b274b863158d4a53be2c99ea5f42ede2bb80 SHA1 d608d42b2a831a4b9025fa1d2fd68fb11996293b SHA256 fd3cd6846072dbcacb0a3461a3d1a47bb09b858562df26fb9fc0769f0a292bf4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7FV5AACgkQuUQtlDBCeQI5RgCfXL5G9LH72IXdFIRj3H7V/OVA
-39sAnj2TAW723LCTBvmwZgUIdk2BU0Su
-=VFcX
+iF4EAREIAAYFAk7LpsoACgkQFYEBGcdFJfLgHAD/XHIGoYkL26CdnXTFz5bm30ca
+b53I1ku/9YDENN92deYA/0na0lTk/jiuYkt/w1ZPrzoDy6ePvuxxfjxlUq/9U0HA
+=qGSZ
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.0_rc3.ebuild b/sys-devel/llvm/llvm-3.0_rc3.ebuild
index 15339a5c6460..4114f5673542 100644
--- a/sys-devel/llvm/llvm-3.0_rc3.ebuild
+++ b/sys-devel/llvm/llvm-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/llvm/llvm-3.0_rc3.ebuild,v 1.1 2011/11/09 22:54:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0_rc3.ebuild,v 1.2 2011/11/22 13:42:23 voyageur Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.0_}/${P/_}.src.tar.gz"
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug +libffi multitarget ocaml test udis86 vim-syntax"
+IUSE="debug gold +libffi multitarget ocaml test udis86 vim-syntax"
 
 DEPEND="dev-lang/perl
 	>=sys-devel/make-3.79
@@ -20,6 +20,7 @@ DEPEND="dev-lang/perl
 	>=sys-devel/bison-1.875d
 	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
+	gold? ( >=sys-devel/binutils-2.22 )
 	libffi? ( dev-util/pkgconfig
 		virtual/libffi )
 	ocaml? ( dev-lang/ocaml )
@@ -80,6 +81,10 @@ src_prepare() {
 	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
 		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
 		-i Makefile.rules || die "rpath sed failed"
+	if use gold; then
+		sed -e 's,\$(SharedLibDir),'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
+			-i tools/gold/Makefile || die "gold rpath sed failed"
+	fi
 
 	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
 	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
@@ -102,6 +107,9 @@ src_configure() {
 		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
 	fi
 
+	if use gold; then
+		CONF_FLAGS="${CONF_FLAGS} --with-binutils-include=${EPREFIX}/usr/include/"
+	fi
 	if use ocaml; then
 		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
 	else
diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
index d1e724f140cc..140a2f8c7cf3 100644
--- a/sys-devel/llvm/metadata.xml
+++ b/sys-devel/llvm/metadata.xml
@@ -11,6 +11,7 @@
    3. A compiler infrastructure - LLVM is also a collection of source code that implements the language and compilation strategy. The primary components of the LLVM infrastructure are a GCC-based C and C++ front-end, a link-time optimization framework with a growing set of global and interprocedural analyses and transformations, static back-ends for many popular (and some obscure) architectures, a back-end which emits portable C code, and a Just-In-Time compilers for several architectures.
    4. LLVM does not imply things that you would expect from a high-level virtual machine. It does not require garbage collection or run-time code generation (In fact, LLVM makes a great static compiler!). Note that optional LLVM components can be used to build high-level virtual machines and other systems that need these services.</longdescription>
 	<use>
+		<flag name='gold'>Build the gold linker plugin</flag>
 		<flag name='llvm-gcc'>Build LLVM with <pkg>sys-devel/llvm-gcc</pkg></flag>
 		<flag name='multitarget'>Build all host targets (default: host only)</flag>
 		<flag name='udis86'>Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag>