Fix path to gold plugin, thanks mgorny in bug #397547

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

5 files changed, 23 insertions, 200 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 314160e7a0b3..36eaf9783cfe 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,12 @@
 # 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.51 2012/01/26 00:42:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.52 2012/02/03 14:29:44 voyageur Exp $
+
+*clang-3.0-r2 (03 Feb 2012)
+
+  03 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> -clang-3.0.ebuild,
+  -clang-3.0-r1.ebuild, +clang-3.0-r2.ebuild, clang-9999.ebuild:
+  Fix path to gold plugin, thanks mgorny in bug #397547
 
   25 Jan 2012; Luca Barbato <lu_zero@gentoo.org>
   +files/clang-3.1-fix_cxx_include_root.patch, clang-9999.ebuild:
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index ac6e08b2c3d6..d4de3f99c87b 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -18,15 +18,14 @@ DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 5
 DIST llvm-3.0.tar.gz 10350539 RMD160 85211cafbed1c5d838ac54669017b5298613f975 SHA1 b683e7294fcf69887c0d709025d4640f5dca755b SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
 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-r1.ebuild 6314 RMD160 38d35dc272a3956dbd9ae0fbd70e4d6f545459f6 SHA1 b49afc2e711b98e77073ed7a866af5b084e14dd0 SHA256 932f31bdf21eb4155cb01f792e5d840ff63359e9cc62f6bd98e60a75037e1a36
-EBUILD clang-3.0.ebuild 6126 RMD160 a4ed15f30aa6e88035d8ccccc9b07543c5102f20 SHA1 d52bef71e61f4ff0d7d134951f8dba7ea4dc88a3 SHA256 539491f7e2a6f24bd4d2617c417691f0947db4a3ea25178c319688511b5cc164
-EBUILD clang-9999.ebuild 6039 RMD160 38257cfd647af1507ef7d342cbb44704c17a5c80 SHA1 4f1c297eedfce87557a1c2877d2553ce19c4fb2b SHA256 80bdb2bc7f503c177efa817f1aa3c11bd73c0e2a5fedf43cda81f6f03db017aa
-MISC ChangeLog 9750 RMD160 7443015b4450b7c17561fe5e8b3cd2ad5a22717e SHA1 117e0d6c830220bca36009b6ddec56e8838e59ec SHA256 df9e4e5e8d2f92cceb8c4cf1e6b3f063c677e9ef6fbd157c54af453c73207073
+EBUILD clang-3.0-r2.ebuild 6483 RMD160 e978aa52690578e0a088ca7a10bda0f3c03107ad SHA1 a642f548abc00defb9a1452eda78e66ee29f47dc SHA256 87ca3aa1518dedbbe5632e5c2637e9e15fc342044430d7024a15dd038c3329e4
+EBUILD clang-9999.ebuild 6209 RMD160 772b2786b56b295faa3905c4c525ef630165229b SHA1 20320b8901614d855826edd27958345e2931066e SHA256 636526217b24cdb4d93e96311b770126449635b3c40816fd170ee36ebaaca825
+MISC ChangeLog 9976 RMD160 614419f5584ed9bdb36bb5d63c4f83f58955722c SHA1 0f7733b3beede1dc475a60066be579d259276fb1 SHA256 b96412051c1f273a8d65de1f3a18aed392f8972aeda1a02e7322f67fe4244a06
 MISC metadata.xml 1339 RMD160 5f8b76cda96fc95f67fd8ff7f977c116a4f0f28a SHA1 034f922ae098216b179e9d5c78246f9caa95b9d6 SHA256 0ef2f9bcc4f3293dcb69b2c882b93737b9be496e6f8789efa69df6adb2c1edf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8goZoACgkQYpJnKVbCxcx6iQEAiv69vv3/AE9ICmeT9qhUu1Gm
-BbrMqH9HRjXB06+1wlMA/jOSq5Stn3MbJ0C1Qn74btNJPkJGSMOZ2/mSDiq5CW6R
-=oYHz
+iF4EAREIAAYFAk8r72MACgkQFYEBGcdFJfK+qgEAofSfwroD2SrqST2JJhYd9p/w
+sF/l4lgxBNhn+iJ0yNcA/1lC1lKw4NTQv7BKY5lBzmEt9ywZWPEZQfP8tDrcIuHY
+=WWqa
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/clang/clang-3.0-r1.ebuild b/sys-devel/clang/clang-3.0-r2.ebuild
index 73b1beaa5b56..bb83033161b3 100644
--- a/sys-devel/clang/clang-3.0-r1.ebuild
+++ b/sys-devel/clang/clang-3.0-r2.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/clang/clang-3.0-r1.ebuild,v 1.1 2012/01/13 22:25:18 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0-r2.ebuild,v 1.1 2012/02/03 14:29:44 voyageur Exp $
 
 EAPI=3
 
@@ -44,6 +44,10 @@ src_prepare() {
 	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
 		-i tools/clang/tools/scan-build/scan-build \
 		|| die "scan-build sed failed"
+	# Set correct path for gold plugin
+	sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \
+		-i  tools/clang/lib/Driver/Tools.cpp \
+		|| die "gold plugin path sed failed"
 	# Specify python version
 	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
 
diff --git a/sys-devel/clang/clang-3.0.ebuild b/sys-devel/clang/clang-3.0.ebuild
deleted file mode 100644
index a33d5023f60e..000000000000
--- a/sys-devel/clang/clang-3.0.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# 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-3.0.ebuild,v 1.1 2011/12/02 13:20:51 voyageur Exp $
-
-EAPI=3
-
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils multilib python
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="http://clang.llvm.org/"
-# Fetching LLVM as well: see http://llvm.org/bugs/show_bug.cgi?id=4840
-SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.tar.gz
-	http://llvm.org/releases/${PV}/${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug multitarget +static-analyzer +system-cxx-headers test"
-
-DEPEND="static-analyzer? ( dev-lang/perl )"
-RDEPEND="~sys-devel/llvm-${PV}[multitarget=]"
-
-S=${WORKDIR}/llvm-${PV}.src
-
-src_prepare() {
-	mv "${WORKDIR}"/clang-${PV}.src "${S}"/tools/clang || die "clang source directory move failed"
-
-	# Same as llvm doc patches
-	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}"/${P/_*}-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 \
-		|| die "scan-view sed failed"
-	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
-		-i tools/clang/tools/scan-build/scan-build \
-		|| die "scan-build sed failed"
-	# Specify python version
-	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
-
-	# From llvm src_prepare
-	einfo "Fixing install dirs"
-	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
-		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
-		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \
-		-i Makefile.config.in || die "Makefile.config sed failed"
-
-	einfo "Fixing rpath and CFLAGS"
-	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
-		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
-		-i Makefile.rules || die "rpath sed failed"
-}
-
-src_configure() {
-	local CONF_FLAGS="--enable-shared
-		--with-optimize-option=
-		$(use_enable !debug optimized)
-		$(use_enable debug assertions)
-		$(use_enable debug expensive-checks)"
-
-	# Setup the search path to include the Prefix includes
-	if use prefix ; then
-		CONF_FLAGS="${CONF_FLAGS} \
-			--with-c-include-dirs=${EPREFIX}/usr/include:/usr/include"
-	fi
-
-	if use multitarget; 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
-
-	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"
-}
-
-src_compile() {
-	local COMPILE_TARGET
-	if use test; then
-		COMPILE_TARGET="all"
-	else
-		COMPILE_TARGET="clang-only"
-	fi
-	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 \
-		${COMPILE_TARGET} || die "emake failed"
-}
-
-src_test() {
-	cd "${S}"/test || die "cd failed"
-	emake site.exp || die "updating llvm site.exp failed"
-
-	cd "${S}"/tools/clang || die "cd clang failed"
-
-	# Broken test always assuming i386 host with multilib gcc 4.6.0
-	# http://llvm.org/bugs/show_bug.cgi?id=11094
-	rm -f test/Driver/linux-ld.c
-
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	if ! emake -j1 VERBOSE=1 test; then
-		has test $FEATURES && die "Make test failed. See above for details."
-		has test $FEATURES || eerror "Make test failed. See above for details."
-	fi
-}
-
-src_install() {
-	cd "${S}"/tools/clang || die "cd clang failed"
-	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
-
-	if use static-analyzer ; then
-		dobin tools/scan-build/ccc-analyzer
-		dosym ccc-analyzer /usr/bin/c++-analyzer
-		dobin tools/scan-build/scan-build
-
-		insinto /usr/share/${PN}
-		doins tools/scan-build/scanview.css
-		doins tools/scan-build/sorttable.js
-
-		cd tools/scan-view || die "cd scan-view failed"
-		dobin scan-view
-		install-scan-view() {
-			insinto "$(python_get_sitedir)"/clang
-			doins Reporter.py Resources ScanView.py startfile.py
-			touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py
-		}
-		python_execute_function install-scan-view
-	fi
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		for lib in libclang.dylib ; do
-			ebegin "fixing install_name of $lib"
-			install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \
-				"${ED}"/usr/lib/llvm/${lib}
-			eend $?
-		done
-		for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do
-			ebegin "fixing references in ${f##*/}"
-			install_name_tool \
-				-change "@rpath/libclang.dylib" \
-					"${EPREFIX}"/usr/lib/llvm/libclang.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 \
-				"${ED}"/$f
-			eend $?
-		done
-	fi
-}
-
-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() {
-	python_mod_cleanup clang
-}
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 49770bc70e4e..297d9cb8e5af 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.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/clang/clang-9999.ebuild,v 1.22 2012/01/26 00:42:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.23 2012/02/03 14:29:44 voyageur Exp $
 
 EAPI=3
 
@@ -47,6 +47,10 @@ src_prepare() {
 	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
 		-i tools/clang/tools/scan-build/scan-build \
 		|| die "scan-build sed failed"
+	# Set correct path for gold plugin
+	sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \
+		-i  tools/clang/lib/Driver/Tools.cpp \
+		|| die "gold plugin path sed failed"
 	# Specify python version
 	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view