Fix gold plugin build (using correct libLTO), thanks Rafał Mużyło and grobian in bug #398391

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

4 files changed, 26 insertions, 11 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 5c415190554e..28d35dd3efec 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.61 2012/01/27 15:21:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.62 2012/02/03 13:11:42 voyageur Exp $
+
+*llvm-3.0-r1 (03 Feb 2012)
+
+  03 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> -llvm-3.0.ebuild,
+  +llvm-3.0-r1.ebuild, +files/llvm-3.0-gold_LTO_link.patch:
+  Fix gold plugin build (using correct libLTO), thanks Rafał Mużyło and
+  grobian in bug #398391
 
   27 Jan 2012; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.0.ebuild,
   +files/llvm-3.0-PPC_macro.patch:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 173f8a13cd4d..d61bf7593e4a 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -8,20 +8,21 @@ AUX llvm-2.8-darwin8.patch 576 RMD160 ed1d9c8d9eda3fecf55b7848eee76cdd92a59a13 S
 AUX llvm-2.9-Operator.h-c++0x.patch 2062 RMD160 3f137dc80cac2d77b978a332a731e443a15e6a7c SHA1 8bc7357b793cb5cc83e54f056d54d311ec93853d SHA256 1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7
 AUX llvm-2.9-nodoctargz.patch 1569 RMD160 6589aa0a41f47e915ce93fe6dcf68dd601c3bcdc SHA1 19795ec9c34e6ec5539ec6a77944ceb51abdef72 SHA256 62f1b080364d94e528bb34f0063562d16a59395aa7f97277bba88fbd93e00b84
 AUX llvm-3.0-PPC_macro.patch 1825 RMD160 d991c5c8c05cdc6e4ce6bf4b43059f54822d69b8 SHA1 11a5439873ed00152f2ee2635313aec22ec58452 SHA256 e56947d9744549ef6903238653c6569b5f91a1eb1bd84ec5d69d32ce5b20d6e4
+AUX llvm-3.0-gold_LTO_link.patch 442 RMD160 f480458cc7ef79bbfb948c2f6d2e4122eb55c564 SHA1 a92ac6454a751daf6643c1b402d102ce3c304b73 SHA256 62dc70a1d1f581b7f768ca728dcca688a741e03e64566d5f38e02e33c6372ab8
 AUX llvm-3.0-ocaml_install.patch 664 RMD160 c439931f952e7e053b726435ae0a8e502ebe5080 SHA1 15c8a81baa0e6e78d734f5451b319bf6d896eb2a SHA256 6f451130ed8fcced98691361d33d4d44d8866e703673c293cf7f88af8362e694
 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.0.tar.gz 10350539 RMD160 85211cafbed1c5d838ac54669017b5298613f975 SHA1 b683e7294fcf69887c0d709025d4640f5dca755b SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
 EBUILD llvm-2.8-r2.ebuild 6222 RMD160 34c51d4deb8ba605df908542a581099af7043a7f SHA1 c86b4cfe710b65ffedd934096df8394da9a8798f SHA256 4e9fc704a4aa3b1a8e07bf9807f1f3fbdc429d1ab075edf025dd6b96e003d852
 EBUILD llvm-2.9-r2.ebuild 6179 RMD160 47fd4981eb19d1abd644f6a4b268b04f04b1a77c SHA1 03be220126b66435115c9b90606728aca9eebf25 SHA256 3118e5514d5f0adf026e8bab1dd6b13c07702480dd1b475c6861c0696c0f2dd9
-EBUILD llvm-3.0.ebuild 5469 RMD160 8a6ded6a0f2efa3a386bcff0e54d33d158fbe9f2 SHA1 21d69ad3796f4c4657d2d7b1a0ddba222589714e SHA256 91678be32a0bd24cf1531f537f7a9ebcb05d534e39d2ad9c6ca25748a5f54cce
+EBUILD llvm-3.0-r1.ebuild 5369 RMD160 056ead5343975d2bb65a95cb535b19f01a5ac2de SHA1 6e702c87760ef12cc073a25418d0dc2665f67d8e SHA256 a5b96c52a357094cbfe1c9859a3325c344fd92b5b43734e765a6848615f7394c
 EBUILD llvm-9999.ebuild 5324 RMD160 13c095eaf87c38dd5e6c060036d4bb0071450724 SHA1 e6037858add9d4e644071143091e313daa9d4f71 SHA256 8f63c65d793a4d0574a85015fa262210da1ccdec90e0e45d6b3cf085b2772335
-MISC ChangeLog 10188 RMD160 33808da0eef323cc9ceb68f9bed5385775937a7a SHA1 20a83338cb0d64c12be8740886b8074074c3927a SHA256 274e91976c2d045d63b9e734e427a7752291771dac95f4a5f9399b76f63fe2d5
+MISC ChangeLog 10450 RMD160 3a0c112084a9a362ec714c67db43fa7f42a1efaf SHA1 25878df0053427985fea2fc9377835a62638482b SHA256 b189de0bd67b80fb5b3c9f54740e0e0b90380f7042edd6389c0dd596b7aeb4c1
 MISC metadata.xml 2290 RMD160 3c36b274b863158d4a53be2c99ea5f42ede2bb80 SHA1 d608d42b2a831a4b9025fa1d2fd68fb11996293b SHA256 fd3cd6846072dbcacb0a3461a3d1a47bb09b858562df26fb9fc0769f0a292bf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8iwRAACgkQFYEBGcdFJfKsswEAoXFJ8bAkj3L9W/GyX9eLF8Qa
-CZVGGNC12xajsaP4qWIA/2fZVd83SfythGALxCDZOpPeffR+8EY1So1oVHqIGtTl
-=g1V/
+iF4EAREIAAYFAk8r3SUACgkQFYEBGcdFJfJaMQEAjsd1EsY1sM29Xl7WzH4hn5QB
+bmor/XgAU+AmOBymSZsBAKbZXGN5soUExCubN4pJluNi61OhGCBbtNVIUacCbTTz
+=/A6N
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch b/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch
new file mode 100644
index 000000000000..031448d2888a
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch
@@ -0,0 +1,10 @@
+--- tools/gold/Makefile	2011/11/23 03:03:21	145094
++++ tools/gold/Makefile	2011/11/23 03:07:25	145095
+@@ -24,6 +24,6 @@
+ # Because off_t is used in the public API, the largefile parts are required for
+ # ABI compatibility.
+ CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+-CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT)
++CXXFLAGS+=-L$(SharedLibDir)/$(SharedPrefix) -lLTO
+ 
+ include $(LEVEL)/Makefile.common
diff --git a/sys-devel/llvm/llvm-3.0.ebuild b/sys-devel/llvm/llvm-3.0-r1.ebuild
index aa2f9ab5443c..a421e580334f 100644
--- a/sys-devel/llvm/llvm-3.0.ebuild
+++ b/sys-devel/llvm/llvm-3.0-r1.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/llvm/llvm-3.0.ebuild,v 1.4 2012/01/27 15:21:41 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0-r1.ebuild,v 1.1 2012/02/03 13:11:42 voyageur Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -81,15 +81,12 @@ 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
 	epatch "${FILESDIR}"/${P}-ocaml_install.patch
 	epatch "${FILESDIR}"/${P}-PPC_macro.patch
+	epatch "${FILESDIR}"/${P}-gold_LTO_link.patch
 }
 
 src_configure() {