From 758728a90daadcab4fa5b2d1051d40ec28020d48 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Mon, 19 Jul 2010 15:43:09 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-cpp/tbb/ChangeLog | 8 ++- dev-cpp/tbb/Manifest | 11 +-- dev-cpp/tbb/files/tbb-3.0.035-tests.patch | 11 +++ dev-cpp/tbb/tbb-3.0.035.ebuild | 81 +++++++++++++++++++++++ 4 files changed, 106 insertions(+), 5 deletions(-) create mode 100644 dev-cpp/tbb/files/tbb-3.0.035-tests.patch create mode 100644 dev-cpp/tbb/tbb-3.0.035.ebuild diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog index 44fdd60e448a..23f6f5301cec 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.5 2010/05/28 19:09:14 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.6 2010/07/19 15:43:09 bicatali Exp $ + +*tbb-3.0.035 (19 Jul 2010) + + 19 Jul 2010; Sébastien Fabbro +tbb-3.0.035.ebuild, + +files/tbb-3.0.035-tests.patch: + Version bump 28 May 2010; Sébastien Fabbro tbb-3.0.018.ebuild, +files/tbb-3.0.018-tests.patch: diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index fcc954df2a03..a2d793df7359 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -2,16 +2,19 @@ Hash: SHA1 AUX tbb-3.0.018-tests.patch 1175 RMD160 2d46ee593e22ec6a5f5133f02785a8a55f72bf5a SHA1 b476f118c377f018f4080de2bcb59f24be17f004 SHA256 06d4427960aa3a4ca9568deef5d9be44dc93234759c05b7a72c97feed3993165 +AUX tbb-3.0.035-tests.patch 678 RMD160 b5a83164ea53f58a6b9deee10575bda9e5930b19 SHA1 07b87610457233240da05302e20a3533e67043b7 SHA256 e044324bddf20a8977af3fb8c43932363f9e177ef51d54dd408dbf7022b8908b DIST tbb22_013oss_src.tgz 1519663 RMD160 158b62914b9467054eaf45c064fd0a940fe3a8d2 SHA1 b8e11fc8df5b6e27eec86a0588d9b376e520dfb5 SHA256 fc156e63cb4dbf4f31b412780ea798b95ecb5cbeb5f5f0f0a9510769f5205562 DIST tbb30_018oss_src.tgz 1550402 RMD160 9655250d6974c38c2572d20cb41a62de13528f60 SHA1 d23755829aa0bc96fa59c3032c0c1bdf1dd3a62c SHA256 6a6e79ae3866ddaea664ae0e93e31563f16024a950c11be52a441c0c91ef62e7 +DIST tbb30_035oss_src.tgz 1556121 RMD160 9fc04205a8bb094fc1209988c100bf3b01ae5abd SHA1 7932a5db3cef757812074d18c051521d1b8de92c SHA256 1bcab3a433f1c6cc6b45ac856a43e055cb6ae8a19d1d5e6f97257bafabfc909e EBUILD tbb-2.2.013-r1.ebuild 2021 RMD160 236b4c5f5b951fd93cbdcb057ee8d5d275a4d312 SHA1 b22338254a18f51f675f21adf32abc8346ac26d2 SHA256 af85f580290a478a996cf04d1f8d906f92bccd3aae324f1b2076b9f13c99301c EBUILD tbb-3.0.018.ebuild 2042 RMD160 82d570b7f738dbc373080a1cfb9bc9a2c56b0b74 SHA1 912aa90c3fca3f1420dab085a6ae8f181bbbcefe SHA256 7069f4a644b6d49ea6a2928d963d6662d8a66e81a104d6ee78f8d3a372f78bc5 -MISC ChangeLog 1262 RMD160 98090ba13ab88ddac3487c052a0ef6179166cf05 SHA1 0750f3814e135a3ad8ab575583a5053cf325b663 SHA256 ea03bb9dc7918af5ca3051f507ef0b138f2377acf5f023b50c0dd618895a3326 +EBUILD tbb-3.0.035.ebuild 2061 RMD160 78fd3e1a9c10df09dc577a2762067e844ad13a45 SHA1 228985e2eebe9e2af607cd4819dd87261c227194 SHA256 0674b225f75d5e9b3d156edced1773c3356431d80d83243065178884bcbb89e2 +MISC ChangeLog 1416 RMD160 9f109eda1c20d96a3f85c24117d66791eb7b0954 SHA1 76f888fb0a696aa1b164ad2a04353d145cacceb7 SHA256 c9f6558e1010f30cbb29678172d93bde6c889f297a2644f57f0d0136347bcb98 MISC metadata.xml 717 RMD160 be2d076186bcee46082c531ff7e353a4c8ee1586 SHA1 bf683cdbaf02706d765d87beec9c9441d7f3f731 SHA256 1ea1ffacad0bf891171794c5f07ca78e1194d2b9438be5563b23a03f7acf39c2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwAHgQACgkQ1ycZbhPLE2BGbACfW2ZblRFsm9XM0Ym3ApvoLD8e -vKQAnR0mhZ4x2Mjzb0jw0mbCJJCuis1j -=w/Zy +iEYEARECAAYFAkxEcpUACgkQ1ycZbhPLE2BHcACeKXWOwC79ax1wiQpjKWQK3pmV +1ZQAoK/M79vQnDxYTKJOX/pbGp8gPtjL +=BaDG -----END PGP SIGNATURE----- diff --git a/dev-cpp/tbb/files/tbb-3.0.035-tests.patch b/dev-cpp/tbb/files/tbb-3.0.035-tests.patch new file mode 100644 index 000000000000..c756dfd908ea --- /dev/null +++ b/dev-cpp/tbb/files/tbb-3.0.035-tests.patch @@ -0,0 +1,11 @@ +--- build/Makefile.test.orig 2010-07-16 16:45:38.000000000 +0100 ++++ build/Makefile.test 2010-07-16 16:46:09.000000000 +0100 +@@ -191,7 +191,7 @@ + # If a component Y uses component X, then tests for Y should come after tests for X. + # Note that usually run_cmd is empty, and tests run directly + test_tbb_plain: $(TEST_PREREQUISITE) $(TASK_CPP_DIRECTLY_INCLUDED) $(TEST_TBB_PLAIN.EXE) +- $(run_cmd) ./test_tbb_version.$(TEST_EXT) $(args) ++ #$(run_cmd) ./test_tbb_version.$(TEST_EXT) $(args) + # Checking TBB version first to make sure the following testing has anything in it + $(run_cmd) ./test_assembly.$(TEST_EXT) $(args) + $(run_cmd) ./test_compiler.$(TEST_EXT) $(args) diff --git a/dev-cpp/tbb/tbb-3.0.035.ebuild b/dev-cpp/tbb/tbb-3.0.035.ebuild new file mode 100644 index 000000000000..5b54dfe973dc --- /dev/null +++ b/dev-cpp/tbb/tbb-3.0.035.ebuild @@ -0,0 +1,81 @@ +# 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.035.ebuild,v 1.1 2010/07/19 15:43:09 bicatali Exp $ + +EAPI=2 +inherit eutils versionator toolchain-funcs alternatives +# url number +MYU="78/155" +# release update +MYR="%20update%20"1 + +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 +} -- 2.26.2