Fix rpath sed and disable shared library use, thanks Nick Bowler <nbowler@draconx.ca> in bug #338231

Package-Manager: portage-2.2_rc85/cvs/Linux x86_64

5 files changed, 22 insertions, 14 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 2d5270e2d4ce..790562630e44 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.23 2010/09/17 14:35:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.24 2010/09/21 16:14:35 voyageur Exp $
+
+*clang-2.7-r4 (21 Sep 2010)
+
+  21 Sep 2010; Bernard Cafarelli <voyageur@gentoo.org> -clang-2.7-r3.ebuild,
+  +clang-2.7-r4.ebuild, clang-9999.ebuild:
+  Fix rpath sed and disable shared library use, thanks Nick Bowler
+  <nbowler@draconx.ca> in bug #338231
 
 *clang-2.7-r3 (17 Sep 2010)
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 6883df501bf7..ed0988ac2ed7 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -3,7 +3,7 @@ AUX clang-2.7-fixdoc.patch 1977 RMD160 62f52e5580baa396d93c56735c0039c8691b43b6
 DIST clang-2.7.tgz 4953739 RMD160 177fdcf59be4a60c37cf0dfb058535c9cdbbad4e SHA1 4d8326bfe2308a7355a5e4ca2eb172bffd761e1e SHA256 fb349471947f155c1cda1c8a4a3bbc7fa437b86f6875d9978f86c915dfed623a
 DIST llvm-2.7.tgz 8374297 RMD160 0fa2f362dd6a45efec35ce8fa0f8d36d98f32c8f SHA1 059fc21b0ec1b649c4a3dec81756e5f92aa131a2 SHA256 99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5
 EBUILD clang-2.7-r2.ebuild 5583 RMD160 2cfcd080c54db32aff6490e4319e5f98a3554eff SHA1 cb7b437e296dddb12580d7acb05fea88e819accb SHA256 f315ed11c7a0b3a3e3f5b8f057bbc68c67dc539fa1651fc01631247ecee2810e
-EBUILD clang-2.7-r3.ebuild 5614 RMD160 d60152137c5aaff703b828b08b521746ab005b95 SHA1 8936ba93e3af341f494ebc482801aa38536ea4cd SHA256 39f7826345d35be24a5f97b0f1442d20a7345f001364de1a4f2a6dbaf1d08e9f
-EBUILD clang-9999.ebuild 5308 RMD160 22e25a6cd6147bda2ffbbf13e050b92871815d6b SHA1 33c2342c8419bff669dd66304df7ea8b04ecea9a SHA256 f8154c744a31f2d839ea6d0f3e1d3b9233eca7d628504e36c8384e78591a474b
-MISC ChangeLog 4064 RMD160 0e9da481997b343ef902c526c81353aeffceb6dd SHA1 247fc7da77a7e55d8326bcc1df677e96380f1a1a SHA256 394db022748934b343ff13421057352912b2a76d2556a691a642a36a0bd03d40
+EBUILD clang-2.7-r4.ebuild 5698 RMD160 3696f22da1c248567a23f7d93c074f20e4b18647 SHA1 3d68f473c04054bbed11c4397925f1bbc5fcf0e5 SHA256 ccbb47c31340d22ed2f3e78f162d6e68975107609b2dcee3bf4e61c8f29b5c3b
+EBUILD clang-9999.ebuild 5361 RMD160 79ac2d54fb6b9fcfb12034097767c02551b84d84 SHA1 2bb6e1e0fd98a90db1417dee32cbb4269a7e3406 SHA256 5954848a23d484ca2ae89cd99ab198592cee6d3efeb4020cb04f020f1f1f98c0
+MISC ChangeLog 4319 RMD160 7fad454d24e30113e2ae8d8220cc3abaf00e647b SHA1 6d5e074265dd32ca9375768cbeb47d592f521826 SHA256 630dd07d12d1357006b0d56cd8b38d6b8bdac669a83699df8702f489929ff06b
 MISC metadata.xml 1283 RMD160 f9c1bc71ac9c387f558cb4c08c7e16c73cd9e63e SHA1 0bff06a0d4a5e3435cd95864a70e931adc2b50b7 SHA256 c5e5ad2fb8f07fdb458e423f8546cf4002fbd11241c50f7efa8b4975836c50a4
diff --git a/sys-devel/clang/clang-2.7-r3.ebuild b/sys-devel/clang/clang-2.7-r4.ebuild
index 2d8bb20d89b8..a30467b1cabb 100644
--- a/sys-devel/clang/clang-2.7-r3.ebuild
+++ b/sys-devel/clang/clang-2.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.7-r3.ebuild,v 1.1 2010/09/17 14:35:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.7-r4.ebuild,v 1.1 2010/09/21 16:14:35 voyageur Exp $
 
 EAPI=3
 
@@ -62,12 +62,13 @@ src_prepare() {
 		-i Makefile.config.in || die "Makefile.config sed failed"
 
 	einfo "Fixing rpath"
-	sed -e 's/\$(RPATH) -Wl,\$(\(ToolDir\|LibDir\))//g' -i Makefile.rules \
-		|| die "rpath sed failed"
+	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
+		-i Makefile.rules || die "rpath sed failed"
 }
 
 src_configure() {
-	local CONF_FLAGS="--enable-shared"
+	# --enable-shared: undefined symbol, bug #338231
+	local CONF_FLAGS=""
 
 	if use debug; then
 		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 7c71aba519d2..53f146bde025 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.7 2010/08/28 14:06:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.8 2010/09/21 16:14:35 voyageur Exp $
 
 EAPI=3
 
@@ -54,12 +54,12 @@ 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), \
+		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \
 		-i Makefile.config.in || die "Makefile.config sed failed"
 
 	einfo "Fixing rpath"
-	sed -e 's/\$(RPATH) -Wl,\$(\(ToolDir\|LibDir\))//g' -i Makefile.rules \
-		|| die "rpath sed failed"
+	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
+		-i Makefile.rules || die "rpath sed failed"
 }
 
 src_configure() {
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index e39ca67a9935..fd375e6e0b3f 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -4,6 +4,6 @@ AUX llvm-2.7-nodoctargz.patch 1878 RMD160 a6134fd292a1a2c6a594e787ce73b15012be04
 DIST llvm-2.7.tgz 8374297 RMD160 0fa2f362dd6a45efec35ce8fa0f8d36d98f32c8f SHA1 059fc21b0ec1b649c4a3dec81756e5f92aa131a2 SHA256 99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5
 EBUILD llvm-2.7-r2.ebuild 5538 RMD160 3e36cb73164fd354e60a7c1083b3c9966dd95173 SHA1 88e6629da79f994e97c4dc2d3db6d19a1995f852 SHA256 d342cafa2e1e7839ec4f789d5668b0da443be04694edf6c2665864329c1ea920
 EBUILD llvm-2.7.ebuild 5236 RMD160 5a52b3e435fb2d3bdfb1c0db64495a423a5afddb SHA1 7586b8071ecba77ef1c61ac0941d41d7bab49362 SHA256 6fa2d7c4a821aaf8ad14dc5c8a0c0186897e99f5977e053f3175011cad79a6f4
-EBUILD llvm-9999.ebuild 5422 RMD160 fc27bd9f00925bdbee0a91eece22a0c4edb2f7ba SHA1 a5c8018619ffd4dea4dee686efd0302c420e7670 SHA256 94296eb5632bf1db7b1a4d3488d472081a39a888e425887175d4a1aa9871ed7a
-MISC ChangeLog 3677 RMD160 af5aa767232d69a783cf4b28291a38dd40333e3f SHA1 69c993fa0e5db66a249a6dde11a7f6183e5650eb SHA256 b4b1c4545dc4e45bd5d11a608ec16813ebe9e0744d2c2d53d6ceb34c23e5d1a2
+EBUILD llvm-9999.ebuild 5482 RMD160 5c60ea581076bd8142881ceb93efd2b0818783a9 SHA1 c0782574cf0be37750597f94ae0064da73d08b96 SHA256 2b9d6238c0e8a88003e924f060562964f233da4a389bb3fb9d1f11f66952d360
+MISC ChangeLog 3774 RMD160 5b589ca95e4ff6c3821b25a0c120eba04fb28104 SHA1 04c786ac714c5f3ec0567fa909529d929ebcb8e0 SHA256 c4f7c2b002847a61b762e5736161461f05d5545cca09cd7fe5ccc9c7af5eeb09
 MISC metadata.xml 2384 RMD160 9e29d256ab1d3d7cc23fe25d170a1716b6e35dba SHA1 db599887234c1013a7849be3e1b6bd399c716598 SHA256 44f73ce01ca8dc1d2fea546bb70550d6324ed893a224a6db8e55fd932b3a10f8