Drop llvm-config sed in live ebuild, bug #392715. Also add USE=gold handling to it...

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

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index d8927d0b960f45231b8789ab7e6048cfdeb7f4e3..3a820cebdaafc584663d2fa9919cc3098752b0ed 100644 (file)
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.55 2011/12/02 13:20:14 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.56 2011/12/05 11:05:18 voyageur Exp $
+
+  02 Dec 2011; Bernard Cafarelli <voyageur@gentoo.org> llvm-9999.ebuild:
+  Drop llvm-config sed in live ebuild, bug #392715. Also add USE=gold handling
+  to it, bug #392717. Thanks Marcin Mirosław <bug@mejor.pl> for both bug
+  reports
 
 *llvm-3.0 (02 Dec 2011)
 

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 70191afcf54f92e049559a972b5d33a854d854ea..b6e7ddd8b44d847de4fb3b1aada0aeb3351cf4f2 100644 (file)
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -13,13 +13,13 @@ DIST llvm-3.0.tar.gz 10350539 RMD160 85211cafbed1c5d838ac54669017b5298613f975 SH
 EBUILD llvm-2.8-r2.ebuild 6222 RMD160 34c51d4deb8ba605df908542a581099af7043a7f SHA1 c86b4cfe710b65ffedd934096df8394da9a8798f SHA256 4e9fc704a4aa3b1a8e07bf9807f1f3fbdc429d1ab075edf025dd6b96e003d852
 EBUILD llvm-2.9-r2.ebuild 6172 RMD160 f96a803b218716bc4ad4ed3c09584e6744b45053 SHA1 578b0ec8c1154248713741df543dff9af11dffcd SHA256 fea90f5535a6be11f643d18e2a29cb8b04db64d461ace2eebb1028ca18aafe2a
 EBUILD llvm-3.0.ebuild 5369 RMD160 2d30ba09646251db515888448f717f1bcfbbb77d SHA1 0af7bf2b31a856290522b9456e7ac8972e4529a8 SHA256 c421f7927d1c15a7fd042eb11601531392c7bef3b11a65a4eaa2e3226aed0478
-EBUILD llvm-9999.ebuild 5033 RMD160 ac61255318126e1a984b4e725d0bf3e4ab499b21 SHA1 b5190c01e562442f04bd293a8c7584e932190978 SHA256 ab751f00c744caa5189bfba7f933065a79dcdeb627fd95e0594043c5611a7d97
-MISC ChangeLog 9230 RMD160 175f5397116edc054bee317376cf67b028969578 SHA1 e4c34285cce4ab220e2b17d68c531eb58758f857 SHA256 97eaa1e4f69026266f7a66d393eb8acb2e65d158178ca87a71b1f7e705b76e0a
+EBUILD llvm-9999.ebuild 5184 RMD160 413e27866ed87928a727d60dfa403f1e6ff58c47 SHA1 2dfc8d3d7d591c619aad9887221426b14d569fb5 SHA256 36c309bc87075c3763a79f98011e90ed00e67f15343be8303c29dd52eb2c7bc3
+MISC ChangeLog 9467 RMD160 0e5acd37ac44a6ccfdd5eaeb9b3d6a2c6adb274a SHA1 98802402f4dd0abea42640ab33f13797d0d274c7 SHA256 9f17a2e2e72b3f1afee47c80375ca0ec8cae9fe7c103c8f1edb0bf0c14753126
 MISC metadata.xml 2290 RMD160 3c36b274b863158d4a53be2c99ea5f42ede2bb80 SHA1 d608d42b2a831a4b9025fa1d2fd68fb11996293b SHA256 fd3cd6846072dbcacb0a3461a3d1a47bb09b858562df26fb9fc0769f0a292bf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7Y0JoACgkQFYEBGcdFJfLURgD+N++WU+Tz39YjtVvjx5nVan9l
-JpFGzIXRMc+CnWkhilMA/3WB30+PphLiQt8dP4w9IayQe5I029QvUt/Wd0mTw7kp
-=GD1P
+iF4EAREIAAYFAk7cpXkACgkQFYEBGcdFJfJ4jAD/a1YAWZGd6XC5nRmo0dqaK7Eo
+GZIxg2Hvs+nk5e+6dHkBAKVLQG420jgAtUH/bufkavnIzu8btd2F4Z/btj6dce7r
+=pJRq
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index e0304fbe1c084deaae546d41bfb2ae71d80e8780..cdb14117400c8d476599efb7e1a1afc6a90ec24f 100644 (file)
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-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/llvm/llvm-9999.ebuild,v 1.17 2011/11/24 08:56:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.18 2011/12/05 11:05:18 voyageur Exp $
 
 EAPI="3"
 inherit subversion eutils flag-o-matic multilib toolchain-funcs
@@ -13,7 +13,7 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/llvm/trunk"
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-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
@@ -21,6 +21,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 )
@@ -72,13 +73,15 @@ src_prepare() {
                -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
                -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/${PN}, \
                -i Makefile.config.in || die "Makefile.config sed failed"
-       sed -e 's,$ABS_RUN_DIR/lib,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-               -i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed"
 
        einfo "Fixing rpath and CFLAGS"
        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
@@ -101,6 +104,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