Fixed random parallel failures. Respect compilers. Removed forced pentium4 for x86 users. Minor other fixes. Thanks Kevin Pyle for his work (bug #331011)

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 35 insertions, 96 deletions

diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog
index 3b2f6c6eb61c..42f7d0ef08b0 100644
--- a/dev-cpp/tbb/ChangeLog
+++ b/dev-cpp/tbb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/tbb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.8 2010/11/05 19:51:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.9 2010/11/19 06:11:07 bicatali Exp $
+
+  19 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> -tbb-3.0.056.ebuild,
+  tbb-3.0.104.ebuild:
+  Fixed random parallel failures. Respect compilers. Removed forced pentium4
+  for x86 users. Minor other fixes. Thanks Kevin Pyle for his work (bug
+  #331011)
 
 *tbb-3.0.104 (05 Nov 2010)
 
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 9dd90f74cebf..102c0ba27cfe 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -4,17 +4,15 @@ Hash: SHA1
 AUX tbb-3.0.056-tests.patch 885 RMD160 14af2f3f703376ab37668f8c21d57335e070a10a SHA1 688f884ce1fa255b774b6e8a0c684a24bc89beef SHA256 e35bb5e3b9ccf64b080763b52aa689c354ba5289aa01ca89c2610db50da146d8
 AUX tbb-3.0.104-tests.patch 676 RMD160 08111b5f403e0b437e7c23a9905c6ecd4b4cab39 SHA1 b205d4123ca1ca3ec8fb7a839e048ef7ff6063f0 SHA256 7d486b4b462a9d13226a29f303a374209e52c4e5ef0d0c8a216ea0b503bb0b21
 DIST tbb22_013oss_src.tgz 1519663 RMD160 158b62914b9467054eaf45c064fd0a940fe3a8d2 SHA1 b8e11fc8df5b6e27eec86a0588d9b376e520dfb5 SHA256 fc156e63cb4dbf4f31b412780ea798b95ecb5cbeb5f5f0f0a9510769f5205562
-DIST tbb30_056oss_src.tgz 1585216 RMD160 7b49a6fcf61e53a19d194fc5c333f94db6ed4182 SHA1 7063d8e2691b2b0c9534b6e26fdf401b31a944fc SHA256 403c6b0f9e3b7d1a4c6e6e80533a79396748258815e963a5d1558fa232bea8b9
 DIST tbb30_104oss_src.tgz 1592084 RMD160 a034edabc44b7ccfb196d561dd5d2609d0c71854 SHA1 7987f82fc19fb8df2ff61a51767c7fe67c486f52 SHA256 29d0a274d96b8749c91f319571f4d7b257f201fd69eec9812f4af3822235ca81
 EBUILD tbb-2.2.013-r1.ebuild 2021 RMD160 236b4c5f5b951fd93cbdcb057ee8d5d275a4d312 SHA1 b22338254a18f51f675f21adf32abc8346ac26d2 SHA256 af85f580290a478a996cf04d1f8d906f92bccd3aae324f1b2076b9f13c99301c
-EBUILD tbb-3.0.056.ebuild 2044 RMD160 38429cb30d7f8e16db8355a3107fccd1f4a84908 SHA1 a27f90aacef5b76a468d07541b583b6790a865bd SHA256 8619244a970afd8dd0ef66f0e763f54024a03609b1bfbdcfbc697978e2aa617d
-EBUILD tbb-3.0.104.ebuild 2047 RMD160 de41e3bc0588554bf5ea0a5d7b3b3bc420c11b37 SHA1 a7e45f4cf8884c6a6c64beab006809d3dfa83240 SHA256 f89f47dd2f06ffe2113783efe4e1227edcb5f522699088acd335bd775f4fbffb
-MISC ChangeLog 1917 RMD160 c329d01a493259661be8a2249bd595bab8e55e23 SHA1 1122971ea2546fd7f9cb62499bbb18a0a6d5a53d SHA256 30cd6ee26a1017cb0f34b0107f67e1d5881ad8f572e796274996046a3b84d9c9
+EBUILD tbb-3.0.104.ebuild 2900 RMD160 bcea1e36e065b7f71f2119cc0c2fb3584b4366aa SHA1 a368fb087f4ffbc6f49ea12f742ef41611745397 SHA256 d1b0b5b32ea339770ff1ae363376b8dbc227cfaa514ce1b108e9c1455f6786a7
+MISC ChangeLog 2176 RMD160 256742c794d7d85dc2409ce903b99c85c2fa8a23 SHA1 610a0f75ec199d29113e1596bd7691f78db1a1af SHA256 47a4c2e250e70494c9b7a58a445907f31ae6c0a49294e60d57128caa9c411fef
 MISC metadata.xml 717 RMD160 be2d076186bcee46082c531ff7e353a4c8ee1586 SHA1 bf683cdbaf02706d765d87beec9c9441d7f3f731 SHA256 1ea1ffacad0bf891171794c5f07ca78e1194d2b9438be5563b23a03f7acf39c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzUYEwACgkQ1ycZbhPLE2Bz2QCgpyZ1HI2bTPOmMdWPhA+NQ0oc
-q7sAoKhNOsNpkwBa3e4izJUg99m5nPiU
-=yIbf
+iEYEARECAAYFAkzmFQQACgkQ1ycZbhPLE2CvDwCfdVW7IYA4NG3nZXmhHp1tPbHf
+kW0AoI0fwafszY5+j745V2zx2pXC0ZBt
+=IjmJ
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/tbb-3.0.056.ebuild b/dev-cpp/tbb/tbb-3.0.056.ebuild
deleted file mode 100644
index ea4df3b27434..000000000000
--- a/dev-cpp/tbb/tbb-3.0.056.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-3.0.056.ebuild,v 1.1 2010/08/04 22:23:35 bicatali Exp $
-
-EAPI=3
-inherit eutils versionator toolchain-funcs
-#  url number
-MYU="78/157"
-# release update
-MYR="%20update%20"2
-
-PV1="$(get_version_component_range 1)"
-PV2="$(get_version_component_range 2)"
-PV3="$(get_version_component_range 3)"
-MYP="${PN}${PV1}${PV2}_${PV3}oss"
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="http://www.threadingbuildingblocks.org/"
-SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MYR}/${MYP}_src.tgz"
-LICENSE="GPL-2-with-exceptions"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-DEPEND="!<=dev-cpp/tbb-2.1.016"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tests.patch
-	sed -i \
-		-e "s/-O2/${CXXFLAGS}/g" \
-		build/*.inc || die
-}
-
-src_compile() {
-	if [[ $(tc-getCXX) == *g++ ]]; then
-		myconf="compiler=gcc"
-	elif [[ $(tc-getCXX) == *ic*c ]]; then
-		myconf="compiler=icc"
-	fi
-	# from the Makefile, split debug
-	cd src
-	emake ${myconf} tbb_release tbbmalloc_release || die "emake failed"
-	if use debug || use examples; then
-		emake ${myconf} tbb_debug tbbmalloc_debug || die "emake debug failed"
-	fi
-}
-
-src_test() {
-	cd src
-	emake -j1 ${myconf} test_release || die "emake test failed"
-	if use debug || use examples; then
-		emake ${myconf} test_debug tbbmalloc_test_debug || die "emake test debug failed"
-	fi
-
-}
-
-src_install(){
-	for l in $(find build -name lib\*.so.\*); do
-		dolib.so ${l} || die
-		local bl=$(basename ${l})
-		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
-	done
-	insinto /usr
-	doins -r include || die
-
-	dodoc README CHANGES doc/Release_Notes.txt
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/html || die
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples/build
-		doins build/*.inc || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples || die
-	fi
-}
diff --git a/dev-cpp/tbb/tbb-3.0.104.ebuild b/dev-cpp/tbb/tbb-3.0.104.ebuild
index 2f7e1ed529e0..1344084be835 100644
--- a/dev-cpp/tbb/tbb-3.0.104.ebuild
+++ b/dev-cpp/tbb/tbb-3.0.104.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/dev-cpp/tbb/tbb-3.0.104.ebuild,v 1.1 2010/11/05 19:51:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-3.0.104.ebuild,v 1.2 2010/11/19 06:11:07 bicatali Exp $
 
 EAPI=3
 inherit eutils versionator toolchain-funcs
@@ -29,9 +29,25 @@ S="${WORKDIR}/${MYP}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-tests.patch
+	# use fully qualified compilers. do not force pentium4 for x86 users
+	local CC="$(tc-getCC)"
 	sed -i \
 		-e "s/-O2/${CXXFLAGS}/g" \
+		-e 's/^\(CPLUS = \)g++ $/\1'"$(tc-getCXX)/" \
+		-e 's/^\(CONLY = \)gcc$/\1'"${CC}/" \
+		-e 's/\(shell \)gcc\( --version\)/\1'"${CC}"'\2/' \
+		-e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
 		build/*.inc || die
+	# - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
+	#   actual command.
+	# - Force generation of version_string.tmp immediately after the directory
+	#   is created.  This avoids a race when the user builds tbb and tbbmalloc
+	#   concurrently.  The choice of Makefile.tbb (instead of
+	#   Makefile.tbbmalloc) is arbitrary.
+	sed -i \
+		-e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \
+		-e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1"  -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \
+		src/Makefile || die
 }
 
 src_compile() {
@@ -40,20 +56,19 @@ src_compile() {
 	elif [[ $(tc-getCXX) == *ic*c ]]; then
 		myconf="compiler=icc"
 	fi
-	# from the Makefile, split debug
-	cd src
-	emake ${myconf} tbb_release tbbmalloc_release || die "emake failed"
+	local ccconf="${myconf}"
 	if use debug || use examples; then
-		emake ${myconf} tbb_debug tbbmalloc_debug || die "emake debug failed"
+		ccconf="${ccconf} tbb_debug tbbmalloc_debug"
 	fi
+	emake -C src ${ccconf} tbb_release tbbmalloc_release || die "emake failed"
 }
 
 src_test() {
-	cd src
-	emake -j1 ${myconf} test_release || die "emake test failed"
+	local ccconf="${myconf}"
 	if use debug || use examples; then
-		emake -j1 ${myconf} test_debug tbbmalloc_test_debug || die "emake test debug failed"
+		${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
 	fi
+	emake -C src ${ccconf} test_release || die "emake test failed"
 }
 
 src_install(){