summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2010-09-21 16:17:52 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2010-09-21 16:17:52 +0000
commitf47647bd6e8f2664fbbe90732501c5aaddc125df (patch)
tree19204f17860789622f3bbef674566a3804b6f116 /sys-devel
parentRemove old (diff)
downloadgentoo-2-f47647bd6e8f2664fbbe90732501c5aaddc125df.tar.gz
gentoo-2-f47647bd6e8f2664fbbe90732501c5aaddc125df.tar.bz2
gentoo-2-f47647bd6e8f2664fbbe90732501c5aaddc125df.zip
Also fix live ebuild
(Portage version: 2.2_rc85/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/llvm/ChangeLog5
-rw-r--r--sys-devel/llvm/llvm-9999.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 20b0e28a3eea..0c4bc5c40737 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-devel/llvm
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.21 2010/09/21 15:57:12 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.22 2010/09/21 16:17:52 voyageur Exp $
+
+ 21 Sep 2010; Bernard Cafarelli <voyageur@gentoo.org> llvm-9999.ebuild:
+ Also fix live ebuild
*llvm-2.7-r2 (21 Sep 2010)
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 3a3ff71ef11a..69dfca3fd8e1 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-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/llvm/llvm-9999.ebuild,v 1.5 2010/09/17 14:35:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.6 2010/09/21 16:17:52 voyageur Exp $
EAPI="3"
inherit subversion eutils multilib toolchain-funcs
@@ -77,7 +77,8 @@ src_prepare() {
-i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed"
einfo "Fixing rpath"
- sed -e 's/\$(RPATH) -Wl,\$(\(ToolDir\|LibDir\))//g' -i Makefile.rules || die "sed failed"
+ sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
+ -i Makefile.rules || die "rpath sed failed"
epatch "${FILESDIR}"/${PN}-2.7-nodoctargz.patch
epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch