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 | 61fb0aaa7ed06b1da4483ecba52bef0e3d100e66 (patch) | |
| tree | 9cef0258fe1bafb34579dd3ff2733c9e8dc128f7 /sys-devel | |
| parent | fix building with --as-needed with patch from Kacper Kowalik via bug #295827 (diff) | |
| download | historical-61fb0aaa7ed06b1da4483ecba52bef0e3d100e66.tar.gz historical-61fb0aaa7ed06b1da4483ecba52bef0e3d100e66.tar.bz2 historical-61fb0aaa7ed06b1da4483ecba52bef0e3d100e66.zip | |
Fix multilib-strict sed, it broke tests on amd64
Package-Manager: portage-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/Manifest | 14 | ||||
| -rw-r--r-- | sys-devel/clang/clang-2.6-r1.ebuild | 8 |
3 files changed, 11 insertions, 16 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/Manifest b/sys-devel/clang/Manifest index 18039844803e..fbdc19338319 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX clang-2.6-fixdoc.patch 1885 RMD160 40512b1dcbb245c959b77408bcb7c02a590ac7d9 SHA1 67be72160a5733c251bcf9cead453353e0359394 SHA256 b0f5bf5de8af96ea92ee39701feb5131e7c98a21ccf52be53650cce63d1af052 DIST clang-2.6.tar.gz 3857138 RMD160 b7e44abbf28902ff8e3fd4578a5ff9dd34f40817 SHA1 188f29ad3b2c64fcdc791aa34b323ed06452d7ae SHA256 98e22f4f5877fb3c73abb9ddcb3065ba9c94a21146387da7f905e6fd559d39ea DIST llvm-2.6.tar.gz 7790380 RMD160 24d58cb052ab5879aae59eaf4885ec41186ee22a SHA1 547471147cbf6d3e49539e01196ffada2c79c250 SHA256 4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84 -EBUILD clang-2.6-r1.ebuild 3649 RMD160 fd6f2c76d5b63da3b07ef5eba4f68b91ce0bfd9c SHA1 79a1a61647efd350384c59ef693504a827836eea SHA256 67326797265bdbf8542707f8962d9b2f2ca8d2438c0545896339d99de6a3b316 -MISC ChangeLog 1220 RMD160 5e158a7e782dae8373866f7cae0c47d2c790c7f9 SHA1 6b405be454e1e9dc2dca33d983cbab01e08d9de5 SHA256 f08884763275af9f79c94ed1e7e94112c31c48b4a23adc3a9f6d78b00d7471a3 +EBUILD clang-2.6-r1.ebuild 3715 RMD160 47415a27b82a6f3337d6fa192e5f63ad789116b0 SHA1 76842c123a8b20bafcd1c5acc604ac8829700933 SHA256 cbb3d472bbc032bdee4933e29a1e7636ee4a99e6682db5bf51bd760ea0a98194 +MISC ChangeLog 1352 RMD160 4d8451ad43fc2147683990c40ace059c5d6c4514 SHA1 ffb4bc7849bb2c76d3bfaa0bf225c2f70b552a48 SHA256 083c423f4cfb25d4f771f266993b4d756363d9be7257caeb4c4abe53756ca6a5 MISC metadata.xml 1098 RMD160 472ed702bea452e68447b59908bc9279bbb890dd SHA1 ef26faea642b17778814391ccd3016f933ec8e12 SHA256 2d18687396a420ad6aa7179f1104b90962514d2fcf94e3838ce82cd109b359c0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAksT04AACgkQV3J2n04EauxhdgCgoZxq3mLnnom0EI3YpwbuiRYq -uwEAni3FhAX9LNHpYNqqO3TMMq1uYNza -=C3Sr ------END PGP SIGNATURE----- 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." |