diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2009-12-07 18:58:55 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-12-07 18:58:55 +0000 |
| commit | e719a6bc35bebbcc102d59e3d60ebcf96dcf0a9a (patch) | |
| tree | 00e6929bb3a84b08acd8810b598e61f9c4401a0d /sys-devel | |
| parent | fix building with --as-needed with patch from Kacper Kowalik via bug #295827 (diff) | |
| download | gentoo-2-e719a6bc35bebbcc102d59e3d60ebcf96dcf0a9a.tar.gz gentoo-2-e719a6bc35bebbcc102d59e3d60ebcf96dcf0a9a.tar.bz2 gentoo-2-e719a6bc35bebbcc102d59e3d60ebcf96dcf0a9a.zip | |
Fix multilib-strict sed, it broke tests on amd64
(Portage version: 2.2_rc56/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/clang/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/clang/clang-2.6-r1.ebuild | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog index 5646685e759f..b1b18150eb82 100644 --- a/sys-devel/clang/ChangeLog +++ b/sys-devel/clang/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/clang # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.6 2009/11/30 14:15:23 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.7 2009/12/07 18:58:55 voyageur Exp $ + + 07 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org> clang-2.6-r1.ebuild: + Fix multilib-strict sed, it broke tests on amd64 30 Nov 2009; Torsten Veller <tove@gentoo.org> clang-2.6-r1.ebuild: Add missing die: || "die..." -> || die "..." diff --git a/sys-devel/clang/clang-2.6-r1.ebuild b/sys-devel/clang/clang-2.6-r1.ebuild index db7580b26cd7..976c8e49517d 100644 --- a/sys-devel/clang/clang-2.6-r1.ebuild +++ b/sys-devel/clang/clang-2.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.6-r1.ebuild,v 1.2 2009/11/30 14:15:23 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.6-r1.ebuild,v 1.3 2009/12/07 18:58:55 voyageur Exp $ EAPI=2 inherit eutils python @@ -30,7 +30,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.6-fixdoc.patch # multilib-strict - sed -e "s#lib/clang/1.0#$(get_libdir)/clang/1.0#" \ + sed -e "/PROJ_headers/s#lib/clang/1.0#$(get_libdir)/clang/1.0#" \ -i "${S}"/tools/clang/lib/Headers/Makefile \ || die "clang Makefile failed" # fix the static analyzer for in-tree install @@ -71,6 +71,9 @@ src_configure() { CONF_FLAGS="${CONF_FLAGS} --enable-pic" fi + # Skip llvm-gcc parts even if installed + CONF_FLAGS="${CONF_FLAGS} --with-llvmgccdir=/dev/null" + econf ${CONF_FLAGS} || die "econf failed" } @@ -81,7 +84,6 @@ src_compile() { src_test() { cd "${S}"/tools/clang || die "cd clang failed" - # 20091026: many tests fail not finding headers? vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" if ! emake -j1 VERBOSE=1 test; then hasq test $FEATURES && die "Make test failed. See above for details." |