diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2012-02-03 13:11:42 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-02-03 13:11:42 +0000 |
| commit | 4460312a4de2c808cd8b17cf89339f7d4115d7ef (patch) | |
| tree | 0a8ca69083c7501c6bed116d937a9a8417e762a5 /sys-devel/llvm | |
| parent | Mask =sys-libs/ldb-1.1.4 (diff) | |
| download | gentoo-2-4460312a4de2c808cd8b17cf89339f7d4115d7ef.tar.gz gentoo-2-4460312a4de2c808cd8b17cf89339f7d4115d7ef.tar.bz2 gentoo-2-4460312a4de2c808cd8b17cf89339f7d4115d7ef.zip | |
Fix gold plugin build (using correct libLTO), thanks Rafał Mużyło and grobian in bug #398391
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/llvm')
| -rw-r--r-- | sys-devel/llvm/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch | 10 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-3.0-r1.ebuild (renamed from sys-devel/llvm/llvm-3.0.ebuild) | 7 |
3 files changed, 20 insertions, 6 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index 5c415190554e..28d35dd3efec 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.61 2012/01/27 15:21:41 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.62 2012/02/03 13:11:42 voyageur Exp $ + +*llvm-3.0-r1 (03 Feb 2012) + + 03 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> -llvm-3.0.ebuild, + +llvm-3.0-r1.ebuild, +files/llvm-3.0-gold_LTO_link.patch: + Fix gold plugin build (using correct libLTO), thanks Rafał Mużyło and + grobian in bug #398391 27 Jan 2012; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.0.ebuild, +files/llvm-3.0-PPC_macro.patch: diff --git a/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch b/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch new file mode 100644 index 000000000000..031448d2888a --- /dev/null +++ b/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch @@ -0,0 +1,10 @@ +--- tools/gold/Makefile 2011/11/23 03:03:21 145094 ++++ tools/gold/Makefile 2011/11/23 03:07:25 145095 +@@ -24,6 +24,6 @@ + # Because off_t is used in the public API, the largefile parts are required for + # ABI compatibility. + CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +-CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) ++CXXFLAGS+=-L$(SharedLibDir)/$(SharedPrefix) -lLTO + + include $(LEVEL)/Makefile.common diff --git a/sys-devel/llvm/llvm-3.0.ebuild b/sys-devel/llvm/llvm-3.0-r1.ebuild index aa2f9ab5443c..a421e580334f 100644 --- a/sys-devel/llvm/llvm-3.0.ebuild +++ b/sys-devel/llvm/llvm-3.0-r1.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/llvm/llvm-3.0.ebuild,v 1.4 2012/01/27 15:21:41 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0-r1.ebuild,v 1.1 2012/02/03 13:11:42 voyageur Exp $ EAPI="3" inherit eutils flag-o-matic multilib toolchain-funcs @@ -81,15 +81,12 @@ src_prepare() { sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ -e '/OmitFramePointer/s/-fomit-frame-pointer//' \ -i Makefile.rules || die "rpath sed failed" - if use gold; then - sed -e 's,\$(SharedLibDir),'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ - -i tools/gold/Makefile || die "gold rpath sed failed" - fi epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch epatch "${FILESDIR}"/${P}-ocaml_install.patch epatch "${FILESDIR}"/${P}-PPC_macro.patch + epatch "${FILESDIR}"/${P}-gold_LTO_link.patch } src_configure() { |