diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2010-09-21 16:14:35 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2010-09-21 16:14:35 +0000 |
| commit | b04326e392e36fd783d0c96d1d062b282295a0a4 (patch) | |
| tree | 5475bd5360d4551026a50d5c474791819d946bf7 /sys-devel | |
| parent | Fix the rpath sed so llvm-* binaries actually find the llvm shared library (diff) | |
| download | gentoo-2-b04326e392e36fd783d0c96d1d062b282295a0a4.tar.gz gentoo-2-b04326e392e36fd783d0c96d1d062b282295a0a4.tar.bz2 gentoo-2-b04326e392e36fd783d0c96d1d062b282295a0a4.zip | |
Fix rpath sed and disable shared library use, thanks Nick Bowler <nbowler@draconx.ca> in bug #338231
(Portage version: 2.2_rc85/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/clang/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-devel/clang/clang-2.7-r4.ebuild (renamed from sys-devel/clang/clang-2.7-r3.ebuild) | 9 | ||||
| -rw-r--r-- | sys-devel/clang/clang-9999.ebuild | 8 |
3 files changed, 17 insertions, 9 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/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() { |