From 42e2df94158397d89afc4bec2bca41a7b547c2b3 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Thu, 10 Nov 2011 14:01:41 +0000 Subject: [PATCH] Fix tests (needs full compilation of llvm, remove broken test) Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64 --- sys-devel/clang/ChangeLog | 5 ++++- sys-devel/clang/Manifest | 10 +++++----- sys-devel/clang/clang-3.0_rc3.ebuild | 15 +++++++++++++-- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog index 05b1a38f9697..15b30749bfbe 100644 --- a/sys-devel/clang/ChangeLog +++ b/sys-devel/clang/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/clang # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.45 2011/11/09 22:55:22 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.46 2011/11/10 14:01:41 voyageur Exp $ + + 10 Nov 2011; Bernard Cafarelli clang-3.0_rc3.ebuild: + Fix tests (needs full compilation of llvm, remove broken test) *clang-3.0_rc3 (09 Nov 2011) diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index 2f9917eb29f4..3ca49f463cef 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -16,14 +16,14 @@ DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 5 DIST llvm-3.0rc3.src.tar.gz 10348810 RMD160 971ce6ed7c242827a8c02af7248f6305b1624bd3 SHA1 268025875ee738adaf1d45c3a2627f7c6e0b8272 SHA256 273b3a4fb3608b2373680af48bf083253e51a7ef52456034f6542460c0edac18 EBUILD clang-2.8-r3.ebuild 6797 RMD160 ecb174c3026addd2435661bdcca680d27c8f0ccc SHA1 068109d69dc0abc43d3ec57c010028cf273cd0ff SHA256 e1039d4fce36749d5c1aee7e1a95ebcc9a45f1ca2ace4070fd33eac32ae52382 EBUILD clang-2.9-r1.ebuild 6460 RMD160 56389cfa3a9d277c63a0cbf4e96781d331fa30f3 SHA1 8250c053ee1f802d8dc7cba02f9d6139910767bf SHA256 2891bc50c715d38060a5ea4bff21a83ccc90fa335490831adb264fd2308c55a7 -EBUILD clang-3.0_rc3.ebuild 5984 RMD160 1438c3d62a7557c59f668fc28bffea4cbfae34b6 SHA1 2bda336662a3fe9a387ab2b409507d61b68110cc SHA256 57d99722720241415c07215a99867786e06adf9c10404fe551320bc38556481b +EBUILD clang-3.0_rc3.ebuild 6241 RMD160 d873b1a4af109d06f8b6a33e81a72f427aa2548a SHA1 0652a323215f8ba221fbe6b4d76585f69853ad66 SHA256 dbbbbe53ebdfb3596b13c16b08e6f19ed9d0d7cf6a8e65a7a242e879bc94bb76 EBUILD clang-9999.ebuild 5888 RMD160 a1a1004f042815201f528c311c3408ef02219c8e SHA1 a34cdd2f5c012166b8fe839256e1f435ff3ceb21 SHA256 4ffbffb7f9792ef551db71a0ebb5195af80d4b0656d2fb73e461cfd7030b5a7f -MISC ChangeLog 8566 RMD160 4906aff52fefb19586f408b8b7ca8b5eba52541e SHA1 b964c0afb6c954a7b126c27c824440cd223253ed SHA256 fad0e2b77308cad1120ef49b0e44e2178e4dc28fbec08b00670d02e51ce231bc +MISC ChangeLog 8709 RMD160 8633d2d171ab4a4df1ed6cb44fa7326f79380c5f SHA1 a8adaeeb2051fba26e3ebb6e448e6b87343c236b SHA256 2e90d42a740f108c427e8bdc19492eb4ddd6da5016a8affffec53f8cd133e57c MISC metadata.xml 1339 RMD160 5f8b76cda96fc95f67fd8ff7f977c116a4f0f28a SHA1 034f922ae098216b179e9d5c78246f9caa95b9d6 SHA256 0ef2f9bcc4f3293dcb69b2c882b93737b9be496e6f8789efa69df6adb2c1edf8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk67BOUACgkQFYEBGcdFJfJSNAD8DoDxW9x5sXYqjTch1qiDGOVU -5W8Qt10QhN71kl3yJCAA/3Wr1KIflbFnOlOQFpX5+Dk54n/asqUahq8GbJK+umKq -=yV6s +iF4EAREIAAYFAk672VAACgkQFYEBGcdFJfJwbwD/THFLApdmybbn4wFvQfiduaMA +HVxuvrqsd1mQ3vqOikwA/179BZbywaUsP8KvBUK3pFAy6oh29r2ia29R3NjjHOQT +=GjoA -----END PGP SIGNATURE----- diff --git a/sys-devel/clang/clang-3.0_rc3.ebuild b/sys-devel/clang/clang-3.0_rc3.ebuild index 157b91f2d89f..d98bb9a42c23 100644 --- a/sys-devel/clang/clang-3.0_rc3.ebuild +++ b/sys-devel/clang/clang-3.0_rc3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0_rc3.ebuild,v 1.1 2011/11/09 22:55:22 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0_rc3.ebuild,v 1.2 2011/11/10 14:01:41 voyageur Exp $ EAPI=3 @@ -99,7 +99,14 @@ src_configure() { } src_compile() { - emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only || die "emake failed" + local COMPILE_TARGET + if use test; then + COMPILE_TARGET="all" + else + COMPILE_TARGET="clang-only" + fi + emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 \ + ${COMPILE_TARGET} || die "emake failed" } src_test() { @@ -108,6 +115,10 @@ src_test() { cd "${S}"/tools/clang || die "cd clang failed" + # Broken test always assuming i386 host with multilib gcc 4.6.0 + # http://llvm.org/bugs/show_bug.cgi?id=11094 + rm -f test/Driver/linux-ld.c + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" if ! emake -j1 VERBOSE=1 test; then has test $FEATURES && die "Make test failed. See above for details." -- 2.26.2