[gentoo-commits] gentoo-x86 commit in dev-cpp/tbb: ChangeLog tbb-3.0.104.ebuild tbb-3.0.056.ebuild

[gentoo-commits] gentoo-x86 commit in dev-cpp/tbb: ChangeLog tbb-3.0.104.ebuild tbb-3.0.056.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    10/11/19 06:11:07

  Modified:             ChangeLog tbb-3.0.104.ebuild
  Removed:              tbb-3.0.056.ebuild
  Log:
  Fixed random parallel failures. Respect compilers. Removed forced pentium4 for x86 users. Minor other fixes. Thanks Kevin Pyle for his work (bug #331011)
  
  (Portage version: 2.1.9.24/cvs/Linux x86_64)

Revision  Changes    Path
1.9                  dev-cpp/tbb/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/ChangeLog?r1=1.8&r2=1.9

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog	5 Nov 2010 19:51:31 -0000	1.8
+++ ChangeLog	19 Nov 2010 06:11:07 -0000	1.9
@@ -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)
 



1.2                  dev-cpp/tbb/tbb-3.0.104.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/tbb-3.0.104.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/tbb-3.0.104.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/tbb-3.0.104.ebuild?r1=1.1&r2=1.2

Index: tbb-3.0.104.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-3.0.104.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tbb-3.0.104.ebuild	5 Nov 2010 19:51:31 -0000	1.1
+++ tbb-3.0.104.ebuild	19 Nov 2010 06:11:07 -0000	1.2
@@ -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 @@
 
 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 @@
 	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(){