From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PJKBn-0003nu-Il for garchives@archives.gentoo.org; Fri, 19 Nov 2010 06:11:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2861FE0766; Fri, 19 Nov 2010 06:11:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DBE6BE0766 for ; Fri, 19 Nov 2010 06:11:09 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F9581B4040 for ; Fri, 19 Nov 2010 06:11:09 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2162) id B163E20051; Fri, 19 Nov 2010 06:11:07 +0000 (UTC) From: "Sebastien Fabbro (bicatali)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, bicatali@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-cpp/tbb: ChangeLog tbb-3.0.104.ebuild tbb-3.0.056.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog tbb-3.0.104.ebuild tbb-3.0.056.ebuild X-VCS-Directories: dev-cpp/tbb X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro Content-Type: text/plain; charset=utf8 Message-Id: <20101119061107.B163E20051@flycatcher.gentoo.org> Date: Fri, 19 Nov 2010 06:11:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8a2f9a5e-07e2-46e5-98ac-60293d0e0a03 X-Archives-Hash: 24af1193bcbc2f50de8332009f5c26b2 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 penti= um4 for x86 users. Minor other fixes. Thanks Kevin Pyle for his work (bug= #331011) =20 (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/Change= Log?rev=3D1.9&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/Change= Log?rev=3D1.9&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/Change= Log?r1=3D1.8&r2=3D1.9 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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/0= 5 19:51:31 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.9 2010/11/1= 9 06:11:07 bicatali Exp $ + + 19 Nov 2010; S=C3=A9bastien Fabbro -tbb-3.0.056.= ebuild, + tbb-3.0.104.ebuild: + Fixed random parallel failures. Respect compilers. Removed forced pent= ium4 + for x86 users. Minor other fixes. Thanks Kevin Pyle for his work (bug + #331011) =20 *tbb-3.0.104 (05 Nov 2010) =20 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=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/tbb-3.= 0.104.ebuild?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/tbb-3.= 0.104.ebuild?r1=3D1.1&r2=3D1.2 Index: tbb-3.0.104.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 $ =20 EAPI=3D3 inherit eutils versionator toolchain-funcs @@ -29,9 +29,25 @@ =20 src_prepare() { epatch "${FILESDIR}"/${P}-tests.patch + # use fully qualified compilers. do not force pentium4 for x86 users + local CC=3D"$(tc-getCC)" sed -i \ -e "s/-O2/${CXXFLAGS}/g" \ + -e 's/^\(CPLUS =3D \)g++ $/\1'"$(tc-getCXX)/" \ + -e 's/^\(CONLY =3D \)gcc$/\1'"${CC}/" \ + -e 's/\(shell \)gcc\( --version\)/\1'"${CC}"'\2/' \ + -e '/CPLUS_FLAGS +=3D/s/-march=3Dpentium4//' \ build/*.inc || die + # - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the + # actual command. + # - Force generation of version_string.tmp immediately after the direct= ory + # is created. This avoids a race when the user builds tbb and tbbmal= loc + # 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=3D\1 tbb_r= oot=3D$(tbb_root) version_string.tmp!' \ + src/Makefile || die } =20 src_compile() { @@ -40,20 +56,19 @@ elif [[ $(tc-getCXX) =3D=3D *ic*c ]]; then myconf=3D"compiler=3Dicc" fi - # from the Makefile, split debug - cd src - emake ${myconf} tbb_release tbbmalloc_release || die "emake failed" + local ccconf=3D"${myconf}" if use debug || use examples; then - emake ${myconf} tbb_debug tbbmalloc_debug || die "emake debug failed" + ccconf=3D"${ccconf} tbb_debug tbbmalloc_debug" fi + emake -C src ${ccconf} tbb_release tbbmalloc_release || die "emake fail= ed" } =20 src_test() { - cd src - emake -j1 ${myconf} test_release || die "emake test failed" + local ccconf=3D"${myconf}" if use debug || use examples; then - emake -j1 ${myconf} test_debug tbbmalloc_test_debug || die "emake test= debug failed" + ${ccconf}=3D"${myconf} test_debug tbbmalloc_test_debug" fi + emake -C src ${ccconf} test_release || die "emake test failed" } =20 src_install(){