diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2012-01-27 13:42:08 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-01-27 13:42:08 +0000 |
| commit | 18fa583b1660f3a0093abd177aac62e3655caf8c (patch) | |
| tree | 554400625bb774aec2558e5173895152c9dbab4a /sys-devel | |
| parent | Version bump (diff) | |
| download | gentoo-2-18fa583b1660f3a0093abd177aac62e3655caf8c.tar.gz gentoo-2-18fa583b1660f3a0093abd177aac62e3655caf8c.tar.bz2 gentoo-2-18fa583b1660f3a0093abd177aac62e3655caf8c.zip | |
Really fix new llvm-config in live ebuild, bug #392715
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/llvm/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-9999.ebuild | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index 676ca77c8d80..b7564b36b6fa 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,9 @@ # 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.59 2011/12/13 11:45:31 naota Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.60 2012/01/27 13:42:08 voyageur Exp $ + + 27 Jan 2012; Bernard Cafarelli <voyageur@gentoo.org> llvm-9999.ebuild: + Really fix new llvm-config in live ebuild, bug #392715 13 Dec 2011; Naohiro Aota <naota@gentoo.org> llvm-2.9-r2.ebuild: Add ~x86-fbsd wrt #320221 diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index d4ec223b6788..7769888d2d56 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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-9999.ebuild,v 1.19 2011/12/12 18:23:27 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.20 2012/01/27 13:42:08 voyageur Exp $ EAPI="3" inherit subversion eutils flag-o-matic multilib toolchain-funcs @@ -73,6 +73,8 @@ 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 "/ActiveLibDir = ActivePrefix/s/lib/$(get_libdir)\/${PN}/" \ + -i tools/llvm-config/llvm-config.cpp || die "llvm-config sed failed" einfo "Fixing rpath and CFLAGS" sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ |