diff options
author | 2015-06-15 17:08:13 +0000 | |
---|---|---|
committer | 2015-06-15 17:08:13 +0000 | |
commit | 6d353c453be4b274f30314cade0ee8080a61766f (patch) | |
tree | 85c7a0040d6a456dce03505dc695faa26b951103 /dev-cpp | |
parent | Updating remote-id in metadata.xml (diff) | |
download | historical-6d353c453be4b274f30314cade0ee8080a61766f.tar.gz historical-6d353c453be4b274f30314cade0ee8080a61766f.tar.bz2 historical-6d353c453be4b274f30314cade0ee8080a61766f.zip |
Version Bump; drop old
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!
Diffstat (limited to 'dev-cpp')
-rw-r--r-- | dev-cpp/tbb/ChangeLog | 10 | ||||
-rw-r--r-- | dev-cpp/tbb/Manifest | 39 | ||||
-rw-r--r-- | dev-cpp/tbb/files/tbb-4.3.20150611-build.patch | 196 | ||||
-rw-r--r-- | dev-cpp/tbb/tbb-4.2.20140122.ebuild | 127 | ||||
-rw-r--r-- | dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild | 22 | ||||
-rw-r--r-- | dev-cpp/tbb/tbb-4.3.20150611.ebuild (renamed from dev-cpp/tbb/tbb-4.2.20131118.ebuild) | 101 |
6 files changed, 288 insertions, 207 deletions
diff --git a/dev-cpp/tbb/ChangeLog b/dev-cpp/tbb/ChangeLog index a233d78a5ae5..9d2d423eeb49 100644 --- a/dev-cpp/tbb/ChangeLog +++ b/dev-cpp/tbb/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-cpp/tbb # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.52 2015/06/15 16:50:40 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.53 2015/06/15 17:08:07 jlec Exp $ + +*tbb-4.3.20150611 (15 Jun 2015) + + 15 Jun 2015; Justin Lecher <jlec@gentoo.org> + +files/tbb-4.3.20150611-build.patch, +tbb-4.3.20150611.ebuild, + -tbb-4.2.20131118.ebuild, -tbb-4.2.20140122.ebuild, + tbb-4.3.20141023-r1.ebuild: + Version Bump; drop old *tbb-4.3.20141023-r1 (15 Jun 2015) diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index 7056212b7881..f7ca5728008d 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -4,33 +4,32 @@ Hash: SHA512 AUX tbb-4.0.297-underlinking.patch 475 SHA256 489473e0f30a53d13bd508d3d720df2e6db24b1348470febd162d0834bf6a3de SHA512 26103f87299e56e08d404e0cdda47f3b2be89e770ea12e84ee7f681050364e674aca1ba8326b81db0a73c2f53e973b89b97af3f36c7e762d4699767481b64486 WHIRLPOOL 10e6e3f886dc1a8638f1788254e38f7f92ebbd9deab645e215e9abecfe871e8918de490dc0612de276829e75571db82bd04fe1a8606a50e5f2a6b938821a25fe AUX tbb-4.1.20121003-ppc.patch 895 SHA256 762ea4b118ede189c9f527d8fbe4bdad2fb3814729267dc0333b03a5f1056923 SHA512 1b07f84163a1f372519b2a44ce1ed355c5d9bdad1987f2b2efcd5a85b599624b37d907d0dcc0c1d2254b619803edbeabdc5cbb7d933986b78b77081ecd4a23ab WHIRLPOOL cbbe2829f4e829867b4844486f07ff0be509f6b850332f5ee376e86519e0eb63598a2179c687199ad5b16a67ce74080f178940c8ac6bff354bf66dafb7192b06 AUX tbb-4.3-build.patch 4729 SHA256 325f4b13ec59a042f3e92b83bed99b564a305e451c9a4a3dfc7c80a5377da40c SHA512 0542541a6cbb360a002770a2087519e41b7e20e4dc84a4255ba4ad8b9444a26d25e7a3047d08106ddfe0151704aaddad06fbe49fcd9cdeeced281294e8462e7a WHIRLPOOL a29ea567eee7147ecc0aa40c84ed35d7971e14f3a7aae23890d18997b9a880ddfc5342d0cf8504efa2c0ff083e09f88c0db96d7bc4b15b46d2bd50bc17042947 +AUX tbb-4.3.20150611-build.patch 5291 SHA256 048cb0531e39f4cfe7044a48fe1760dd4d78f8da2e0c7a71478e9306ef9b147a SHA512 1648810b9ea89a904eaf2d15168dbf51abefb8ad337aad561f4b93691163ffb9bab52ade91ed71abc2305a60294c33254603ea60f4255fcccf92a2906d4c09a6 WHIRLPOOL d99b55ae96ebbbbc8a5a73668d797dabcc59bd0c662336bac26af9c1871f206e8b182bff3d8a48252476c613c0b73026e49db1f7b9f7975a66564253f0fbd9ea DIST tbb41_20121003oss_src.tgz 2250789 SHA256 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc SHA512 fada6e32a09be2a151746caf3a15729c9ec6043b17e2f0aeb1bd903542310cdc6fe9ad85017ff5b2cfb16ae955c81c8b39ad8cf97f871bfcbd19d4948ef1d821 WHIRLPOOL 6c2a094e1dc6efed7189903bf8a6bbb8688ab1b15134c9f3c09fd5ed6a72315140505f5df410c89b65cd160a896222d71e01b3bfcbcd933281fb18a69eaf33f1 -DIST tbb42_20131118oss_src.tgz 3134290 SHA256 d95b816ac1618f5047d9ac4db1709d1f8bbeafaed597ce1ee7862b9577680882 SHA512 1f3e2bd807b7fa0cf42c712353cc2a622ddad22fe64359e668480617831ac595a46fa8db86ecd0376989cb4928bb4febe4d11a0f27c26437c60ed0a61c451174 WHIRLPOOL 90cc7de2309588dc546c4380d26211edc118f7dd7f1d7e15dcb38facb2ca0da9020129f1c03e4110eeb9b5991203aa0da0ff1561ed9da7cedcc2298e1b2e2a50 -DIST tbb42_20140122oss_src.tgz 3402631 SHA256 f1bd8d983f93a10e340ba63f3a479632ddca1562a5242814dd82a378d3233b75 SHA512 e4391666bdacd6990ed23cf3c8635b18f727e6e794cadba38c2bbe9113990b955f9f341316a541b4b1b5757ec9af9ac0926a56b4a2d9c2485e3b0a6c6aa888ca WHIRLPOOL 3e8f2a5493fd03702f892cf63f0d14a22467ac67c1c4b889e59ab1bb4fda56739c430934f4cfe6b5eeeca38affab32c850aa0f5dce3e587e978d64baebcd7203 DIST tbb43_20141023oss_src.tgz 2777177 SHA256 247a8d22d6850caa37d376aaeaf8bfcb06525ec5561fb6f6ed09cdad2c1f6414 SHA512 0718e7bf5f0b9525da9eb45beedc1c3832ccd813d72b10a7ed7c6a281d342325d04c65f797c29e2551d4f2bd470e57c81f38db0d6bd983f7871a90f2b5fe5020 WHIRLPOOL 7a6bc75e9404cbfc9f1e1bc53ff195e63c605aae1cc2883147d69bdd394694d21f916fa6d1c2708ff397a01c620fdb38966d0da5085df6d23dcba235de18c6a8 +DIST tbb43_20150611oss_src.tgz 2757631 SHA256 221f85fe64e11c9638e43b3c57d5750c26683905fc90827c0bcfefdb286e79c9 SHA512 83d5d827706b774ef5cd6df8082e5d7f48683388684423bb40565dfc25892fc2e57c382f719b78087d83e51edb3f7f7215f33d8b5039b55c32788d80efa6e0b8 WHIRLPOOL 8e98162b2307c759fb26923d76ab784dea81e166c8bf5323869d234da59641c333e5ae30b4a224bccbf20d4f5f6b75c658589f519a165ea3ad7658322f148c72 EBUILD tbb-4.1.20121003-r1.ebuild 3353 SHA256 14cb8d01605f53056db8a670a93ea13bac4a21ba05e33c3373ad5b9c7fd9e9af SHA512 0da009a251bf710f4633a558339a29e040c499c3fdb2f9b27f3a8cee25dfce1350c25411dead5d28f57906efaae742c1ff179fb5e1edd1956c7b7edd52e4ab30 WHIRLPOOL 7fb01cd161fb2066b04fbea717509210a8fbd0bf4fd73a3ea2d9def4b782e4b17680444c00295ecae7d36aa4b4a4b154fa8dee5dd5c6ea297914ed2a4868a020 -EBUILD tbb-4.2.20131118.ebuild 3510 SHA256 8abab54b1e8a71b3e0c9cb9d29084bb8fb6b620ecfe4faef05ba87c1fedfdad4 SHA512 6c271680007ae347f40863a743d55bc4b3d3c1dbd17bec2070696f8aab53a2f67d871f8f4c789bf5eec81c4fb9dc4b832859f0914a55b22e5ffd81ba2e6e1084 WHIRLPOOL b7c156690ac1a40977c56f1ae566307a02a1ae55f2613ccaa4a972fdf7f46f9eb4dc7720a9ed970363b5e72c406d5686acb068eef5bf75855e64b9443017af61 -EBUILD tbb-4.2.20140122.ebuild 3519 SHA256 f92b482f545b29533adfc85ba988438a83017ebf2be2b8b33788932246a19717 SHA512 10ba65f9f3de7a2d90b13b41b8cdffc2d80a917d39f035feeacd7dd4c443286faf6a94ebf888c10b90ac5e884de976834ea51f3e394169a9389a0781bda48e6f WHIRLPOOL 577eaf6f292365f9c9913f67addf47580f3675a18219143dcfb2d1a0a209fa3c48dfaae57ddd0f7228d4d291ab0fe7d736661d92e4891a919452689022a3d26a -EBUILD tbb-4.3.20141023-r1.ebuild 3236 SHA256 9e3845a121f1bcdb44b7cf75e24a8028260fcb3561703bebe545dbf1f0eb4791 SHA512 0a67b4564bdec38e38726a3fddbc5d9cd3aa13eaa6a4421fde65d5d3db136c7e2e468c31ee1d72d85ce49e1219858c980d380cd2936fcc88f11c08a611c9c26a WHIRLPOOL 23243528ff7952e6cbb4fecc0ffaa4fbdf1b3ffd9d84f8ec900b92b8e0017763e6fd025dda5382c540fcd9fd41ed2e64d5adab412df7fc1776dafe158e9584d0 +EBUILD tbb-4.3.20141023-r1.ebuild 3256 SHA256 afc9b70cbde67197c553173eafed5ec3939fc7c68dc647c4a8cdce5d45cad2d6 SHA512 3eeac4c9d066f50769dd85c33c5c56a2d0f2378ab4de5bc6204030638e55fc9fc642e9212547e7c5c9074c363ccea5411d82417562e312a7ae288a71de0101f4 WHIRLPOOL beae481b3a421b2d5a5d6cb5145d264145984cea9b9b8f0d94df68731674fdabbc45c07a98062e81b471ff9b9c2083ce64d23b6397b3667d6ef933386fdd5364 EBUILD tbb-4.3.20141023.ebuild 3521 SHA256 eef3ca608c482ed11a87fd00fd4c74a0cc07d19c0e92c1c1372da0b478995fe4 SHA512 d396a9ec8fa3ae9a60824146a7347457a1b06bd4da07e4b7ddf6aa2723dfcc6c2a134bcd69a87ebcd6b03cf75ea2d9bcf044e94ea5061e5913c567eabb7d247b WHIRLPOOL 4b4b90dc436d6b2ae03703a7b6e425c354290d2e1484a6879c11b7e7c7bed7e208a1f72184150ccfb1fc9da8d2a9a20e3fea249427893c57313b79bbb8192f0d -MISC ChangeLog 8810 SHA256 1e922dcaf01b474f30c040cf9f0a52bea571300601dd5befcb2e01d1ac0c5c48 SHA512 8180214405844a2e620184a3b087d59389b95a2864be0655dcd5a383a94b93440d353010b7c08831bf9a63f8d80ce2311c574e63e15b77b128328d67f3251a2a WHIRLPOOL a80005737086b3a20363615bb0a39a50ff4a81c642d5358ed604abda7c390d1c1aa41b5a425f0f87f5bf375168d4d02adb7ddb9f07d9c7a4c5a49844cb1a8c51 +EBUILD tbb-4.3.20150611.ebuild 3248 SHA256 e2b68981e7dca719d66a646a9193d17e7b7f416cc530521b4ac7bfa922b10cf2 SHA512 e1b6eeca4d2448566b0a888b8acd961f106e6b5821f60c023fc417b6ede37a7fcfa1ac125a6b17714d34880deb3b7718cc5bfc3acb234bc91380d4fa26915556 WHIRLPOOL 8e6fa4f8846e57bf7d53022bc97179c501e6792d0f472013ad89be7f568c1de6f63e11b336b31b24526647967a37630f5c3466f919bd967a4874f8326c23567e +MISC ChangeLog 9065 SHA256 327ddf50259259f4225b36d1e58acc66f2f085f78d19938a4aafd7a6ea9992ca SHA512 8b74fb1aead480be5e2ef41e65a3933cfb0d19bd930a065bcca83f5bf5fae1f37ef2a1fad497741d316f030f9a18b9c5469bbba10f8a92c15ef9645b980ef47b WHIRLPOOL 140f97bc26259df324267b62a941d37ac43940cc5558d5e970929fbac7b86433045de8e6c2a109721c80f1f0d82b1b7cddc150050c33c8094d84dbaeeb8fe60e MISC metadata.xml 507 SHA256 2c4e4f0b91675da8916c33fd9277b846cd9cbcd8f2629b173682273e9e3edb28 SHA512 8efb5b8d01879a8707fc5d9dd2424edff475be7a1664bf23d8c7bf42f20af01d6a15f39c921cdb264560be3e6dd9ad1325fcf6979e326264f0c2e7cf828cd757 WHIRLPOOL 5a99185cb1995f3210930c5e117e11de2395cf4182e3892a5ad6487a61e8ac53e4c9f17ac1742ad40b1b6f4d159e4fde26b3ca9e4bf9d351fc49243a5f40bb2b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJVfwJlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJVfwZ9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF -OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihmUP/02V8915KTmtPP+WNEfQNhlY -pcMXkbN1uxOn+29LzsCkvrQjpifvz6AQF0125eW/oaEKNkJRSmcvAWjdRLSdvqNW -AKebERkX6s8ZqQU6BYuCFMWKpJpHXZKpnDvDCVkJKrL2aCBfoPbWaXibLgTiPYO0 -KSlDhJYUDVqUpkVZpnaDM6g8+paFIwBrZFZg1qrrB2sacynkuHHshbkQwx7tyZF2 -u9VFoVTLeI+wfgyeoH7Pzo/Wwtzem9UohfZbn5GKadspb2GCKkIP7IaeyW6COzz5 -lVaC8nq9hMALAPH5Z8jiZLf6KpwQn3MZYfnEVMXFgyH+KGFFar4muTuiayn9vzNm -BqMKLyCGMHN14aurGI46ctOhAOHB04xBmpMgJYk5hjMEcCK97lIlWsxhrD1cxeIB -M/8YxNdbFaVV84lANqm5GqjutxMhyAdGe0bz4lOlqXNXtxthn0PXZUP08aPX2eWK -7tKyjlD7+/hsiINlBbCh84q+Dxld4bNUg7YGE09pDE6N/U7E5uWK96j9i3qp7tgJ -r6T9Yj83H/HOuWUefHJlvllNG17e6HK2EdVsXnDPVfLfpGIW8BoIRZb88zAQklpp -nfFz5xJY7aks5KKJRIMaFMDZZRJfRJwvLnHL2tL2KTDnH8Wck4dFgQcrvDJrNDDH -m/TyzX8jYcSlmeWOVrhn -=1Rj9 +OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmibdwP/1is5Bb6k/NXo7Fj1PIFDtjB +MoQd93oFBOxBHUX96sf5Z54LUBcbjWxq9bv2h5stqQA0ZX/TFLB8Vi6sLV3yPj7Y +Awqc2pPg5/HRrbS+y8uqDTBl9+VYlvgXy9W1mNkrkJb0tTjtN64jH5ilkgoMb1Ow +qDO7RiyBGPjDCxZ61y871zkvOXTIzkpLafYZujLORyIIhhCB1BM+BmsGpFsmdqoO +H0wQUuVvgKr75SgZeV5S4v3KIpNwirhLE49pp6lI76g9i8RcwxbdDlLcGGJSjrFo +MCH5Z+npF/mn3GgwGN39KgEHT5OYBoZUOEuDY4/IApxY0xxSZBzphQqPaQLSy2JK +rIwfi3xpyVbzr+jnXOn/UHcUibFShkekmwXd/fDoCfKtMPDrKgOnf42RRi2vjBPq +U9w1Pky+59MtsHQJK1BJvCSGldj7+oWPUxxWnPdBc4ahbTGvXGvFDazJkRxOoEOZ +meh6Lmg8UzzyUrq1MGTqFY+CYwlSiYfzhsrZCtLa8wLKT6t8qGmQWy5HxU8K8pOm +sc0hpvySLJ8ShdsvCaDv9CtMEepOS05cVtFhplrK9GuCjW133nvxxv9qJQDN80Li +yoivi8ZYSZLTmNlywcGWo3oeYYs2wlgR1/ygTLre9syCr2ex6/NznIUDTFuuHna6 +MNtfNxh8ifiCHLvtLr36 +=erkc -----END PGP SIGNATURE----- diff --git a/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch new file mode 100644 index 000000000000..42a8bae4640a --- /dev/null +++ b/dev-cpp/tbb/files/tbb-4.3.20150611-build.patch @@ -0,0 +1,196 @@ + build/FreeBSD.gcc.inc | 18 ++++-------------- + build/linux.clang.inc | 26 +++----------------------- + build/linux.gcc.inc | 38 +++++++------------------------------- + 3 files changed, 14 insertions(+), 68 deletions(-) + +diff --git a/build/FreeBSD.gcc.inc b/build/FreeBSD.gcc.inc +index 20f0027..8bbdeba 100644 +--- a/build/FreeBSD.gcc.inc ++++ b/build/FreeBSD.gcc.inc +@@ -28,14 +28,14 @@ WARNING_KEY = -Wall + DYLIB_KEY = -shared + WARNING_SUPPRESS = -Wno-parentheses + +-CPLUS = g++ +-CONLY = gcc ++CPLUS = $(CXX) ++CONLY = $(CC) + LIB_LINK_FLAGS = -shared + LIBS = -lpthread + C_FLAGS = $(CPLUS_FLAGS) + + ifeq ($(cfg), release) +- CPLUS_FLAGS = -g -O2 -DUSE_PTHREAD ++ CPLUS_FLAGS = -g -DUSE_PTHREAD + endif + ifeq ($(cfg), debug) + CPLUS_FLAGS = -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD +@@ -52,22 +52,12 @@ ifeq (ia64,$(arch)) + CPLUS_FLAGS += $(PIC_KEY) + endif + +-ifeq (intel64,$(arch)) +- CPLUS_FLAGS += -m64 +- LIB_LINK_FLAGS += -m64 +-endif +- +-ifeq (ia32,$(arch)) +- CPLUS_FLAGS += -m32 +- LIB_LINK_FLAGS += -m32 +-endif +- + #------------------------------------------------------------------------------ + # Setting assembler data. + #------------------------------------------------------------------------------ + ASSEMBLY_SOURCE=$(arch)-gas + ifeq (ia64,$(arch)) +- ASM=as ++ ASM=$(AS) + TBB_ASM.OBJ = atomic_support.o lock_byte.o log2.o pause.o + MALLOC_ASM.OBJ = atomic_support.o lock_byte.o pause.o + endif +diff --git a/build/linux.clang.inc b/build/linux.clang.inc +index de9aee5..3a366f1 100644 +--- a/build/linux.clang.inc ++++ b/build/linux.clang.inc +@@ -31,15 +31,15 @@ DYLIB_KEY = -shared + EXPORT_KEY = -Wl,--version-script, + LIBDL = -ldl + +-CPLUS = clang++ +-CONLY = clang ++CPLUS := $(CXX) ++CONLY := $(CC) + LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) + LIBS += -lpthread -lrt + LINK_FLAGS = -Wl,-rpath-link=. -rdynamic + C_FLAGS = $(CPLUS_FLAGS) + + ifeq ($(cfg), release) +- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD ++ CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD + endif + ifeq ($(cfg), debug) + CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD +@@ -61,24 +61,10 @@ MALLOC_ASM.OBJ= + + ifeq (intel64,$(arch)) + ITT_NOTIFY = -DDO_ITT_NOTIFY +- CPLUS_FLAGS += -m64 +- LIB_LINK_FLAGS += -m64 + endif + + ifeq (ia32,$(arch)) + ITT_NOTIFY = -DDO_ITT_NOTIFY +- CPLUS_FLAGS += -m32 -march=pentium4 +- LIB_LINK_FLAGS += -m32 +-endif +- +-ifeq (ppc64,$(arch)) +- CPLUS_FLAGS += -m64 +- LIB_LINK_FLAGS += -m64 +-endif +- +-ifeq (ppc32,$(arch)) +- CPLUS_FLAGS += -m32 +- LIB_LINK_FLAGS += -m32 + endif + + ifeq (bg,$(arch)) +@@ -90,12 +76,6 @@ endif + # Setting assembler data. + #------------------------------------------------------------------------------ + ASM = as +-ifeq (intel64,$(arch)) +- ASM_FLAGS += --64 +-endif +-ifeq (ia32,$(arch)) +- ASM_FLAGS += --32 +-endif + ifeq ($(cfg),debug) + ASM_FLAGS += -g + endif +diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc +index 4b7122b..e8ba711 100644 +--- a/build/linux.gcc.inc ++++ b/build/linux.gcc.inc +@@ -32,12 +32,12 @@ DYLIB_KEY = -shared + EXPORT_KEY = -Wl,--version-script, + LIBDL = -ldl + +-CPLUS = g++ +-CONLY = gcc ++CPLUS := $(CXX) ++CONLY := $(CC) + LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) + LIBS += -lpthread -lrt + LINK_FLAGS = -Wl,-rpath-link=. -rdynamic +-C_FLAGS = $(CPLUS_FLAGS) ++C_FLAGS := $(CPLUS_FLAGS) + # gcc 4.4 and higher support -std=c++0x + ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[4-9]|[5-9])")) + CPP11_FLAGS = -std=c++0x -D_TBB_CPP0X +@@ -54,7 +54,7 @@ ifneq (,$(shell gcc -dumpversion | egrep "^4\.[8-9]")) + endif + + ifeq ($(cfg), release) +- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD ++ CPLUS_FLAGS = $(ITT_NOTIFY) -g -DUSE_PTHREAD + endif + ifeq ($(cfg), debug) + CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD +@@ -74,24 +74,12 @@ endif + + ifeq (intel64,$(arch)) + ITT_NOTIFY = -DDO_ITT_NOTIFY +- CPLUS_FLAGS += -m64 $(RTM_KEY) +- LIB_LINK_FLAGS += -m64 ++ CPLUS_FLAGS += $(RTM_KEY) + endif + + ifeq (ia32,$(arch)) + ITT_NOTIFY = -DDO_ITT_NOTIFY +- CPLUS_FLAGS += -m32 -march=pentium4 $(RTM_KEY) +- LIB_LINK_FLAGS += -m32 +-endif +- +-ifeq (ppc64,$(arch)) +- CPLUS_FLAGS += -m64 +- LIB_LINK_FLAGS += -m64 +-endif +- +-ifeq (ppc32,$(arch)) +- CPLUS_FLAGS += -m32 +- LIB_LINK_FLAGS += -m32 ++ CPLUS_FLAGS += $(RTM_KEY) + endif + + ifeq (bg,$(arch)) +@@ -99,12 +87,6 @@ ifeq (bg,$(arch)) + CONLY = $(firstword $(notdir $(shell which powerpc{64,32,}-bg{z..a}-linux-gcc 2>/dev/null))) + endif + +-# for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify) +-ifeq (sparc,$(arch)) +- CPLUS_FLAGS += -mcpu=v9 -m64 +- LIB_LINK_FLAGS += -mcpu=v9 -m64 +-endif +- + # automatically generate "IT" instructions when compiling for Thumb ISA + ifeq (armv7,$(arch)) + CPLUS_FLAGS += -Wa,-mimplicit-it=thumb +@@ -113,13 +95,7 @@ endif + #------------------------------------------------------------------------------ + # Setting assembler data. + #------------------------------------------------------------------------------ +-ASM = as +-ifeq (intel64,$(arch)) +- ASM_FLAGS += --64 +-endif +-ifeq (ia32,$(arch)) +- ASM_FLAGS += --32 +-endif ++ASM := $(AS) + ifeq ($(cfg),debug) + ASM_FLAGS += -g + endif diff --git a/dev-cpp/tbb/tbb-4.2.20140122.ebuild b/dev-cpp/tbb/tbb-4.2.20140122.ebuild deleted file mode 100644 index 9dec2e454592..000000000000 --- a/dev-cpp/tbb/tbb-4.2.20140122.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.2.20140122.ebuild,v 1.3 2014/10/30 14:39:47 aballier Exp $ - -EAPI=5 -inherit eutils flag-o-matic multilib versionator toolchain-funcs - -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://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz" -LICENSE="GPL-2-with-exceptions" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" -IUSE="debug doc examples" - -DEPEND="" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-4.0.297-underlinking.patch - # use fully qualified gcc compilers. do not force march/mcpu - # not tested with icc - # order in sed expressions is important - sed -i \ - -e "s/g++/$(tc-getCXX)/g" \ - -e "s/gcc/$(tc-getCC)/g" \ - -e 's/-m\(arch\|cpu\)=*[[:space:]]//g' \ - -e 's/-\(m\|-\)\(64\|32\)//g' \ - -e 's/-O2/$(CXXFLAGS)/g' \ - -e "/^ASM/s/as/$(tc-getAS)/g" \ - build/*.gcc.inc || die - - # Give it a soname on FreeBSD - echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >> build/FreeBSD.gcc.inc - # Set proper versionning on FreeBSD - sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die - - # force 64bit where applicable, 32bit where applicable... - # built-in detection is based on running kernel, which messes up - # e.g. in a x86 chroot on amd64 kernel. Bug 462130 - # see build/linux.inc for values - use amd64 && export arch=x86_64 - use amd64-linux && export arch=x86_64 - use x86 && export arch=ia32 - use x86-linux && export arch=ia32 - # no idea what to do with ppc but so far it seems to work - - find include -name \*.html -delete || die - - # pc files are for debian and fedora compatibility - # some deps use them - cat <<-EOF > ${PN}.pc.template - prefix=${EPREFIX}/usr - libdir=\${prefix}/$(get_libdir) - includedir=\${prefix}/include - Name: ${PN} - Description: ${DESCRIPTION} - Version: ${PV} - URL: ${HOMEPAGE} - Cflags: -I\${includedir} - EOF - cp ${PN}.pc.template ${PN}.pc - cat <<-EOF >> ${PN}.pc - Libs: -L\${libdir} -ltbb - Libs.private: -lm -lrt - EOF - cp ${PN}.pc.template ${PN}malloc.pc - cat <<-EOF >> ${PN}malloc.pc - Libs: -L\${libdir} -ltbbmalloc - Libs.private: -lm -lrt - EOF - cp ${PN}.pc.template ${PN}malloc_proxy.pc - cat <<-EOF >> ${PN}malloc_proxy.pc - Libs: -L\${libdir} -ltbbmalloc_proxy - Libs.private: -lrt - Requires: tbbmalloc - EOF - use debug || sed -i -e '/_debug/d' Makefile -} - -src_compile() { - if [[ $(tc-getCXX) == *g++* ]]; then - comp="gcc" - elif [[ $(tc-getCXX) == *ic*c ]]; then - comp="icc" - else - die "compiler $(tc-getCXX) not supported by build system" - fi - emake compiler=${comp} tbb tbbmalloc -} - -src_test() { - append-cxxflags -fabi-version=4 - # avoid oversubscribing with -j1 - emake -j1 compiler=${comp} test -} - -src_install(){ - local l - for l in $(find build -name lib\*.so.\*); do - dolib.so ${l} - local bl=$(basename ${l}) - dosym ${bl} /usr/$(get_libdir)/${bl%.*} - done - doheader -r include/* - - insinto /usr/$(get_libdir)/pkgconfig - doins *.pc - - dodoc README CHANGES doc/Release_Notes.txt - use doc && dohtml -r doc/html/* - - if use examples ; then - insinto /usr/share/doc/${PF}/examples/build - doins build/*.inc - insinto /usr/share/doc/${PF}/examples - doins -r examples - fi -} diff --git a/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild b/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild index ecb9e742a154..1b4e2e62e811 100644 --- a/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild +++ b/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild,v 1.1 2015/06/15 16:50:40 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.3.20141023-r1.ebuild,v 1.2 2015/06/15 17:08:07 jlec Exp $ EAPI=5 -inherit eutils flag-o-matic versionator toolchain-funcs multilib-minimal + +inherit eutils flag-o-matic multilib-minimal toolchain-funcs versionator PV1="$(get_version_component_range 1)" PV2="$(get_version_component_range 2)" @@ -14,7 +15,6 @@ DESCRIPTION="High level abstract threading library" HOMEPAGE="http://www.threadingbuildingblocks.org/" SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz" LICENSE="GPL-2-with-exceptions" - SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" IUSE="debug doc examples" @@ -75,15 +75,15 @@ local_src_compile() { local comp arch case ${MULTILIB_ABI_FLAG} in - abi_x86_64) arch=x86_64 ;; - abi_x86_32) arch=ia32 ;; + abi_x86_64) arch=x86_64 ;; + abi_x86_32) arch=ia32 ;; esac case "$(tc-getCXX)" in - *g++*) comp="gcc" ;; - *ic*c) comp="icc" ;; - *clang*) comp="clang" ;; - *) die "compiler $(tc-getCXX) not supported by build system" ;; + *g++*) comp="gcc" ;; + *ic*c) comp="icc" ;; + *clang*) comp="clang" ;; + *) die "compiler $(tc-getCXX) not supported by build system" ;; esac CXX="$(tc-getCXX)" \ @@ -104,7 +104,7 @@ multilib_src_test() { } multilib_src_install() { - cd "${BUILD_DIR}_release" + cd "${BUILD_DIR}_release" || die local l for l in $(find . -name lib\*.so.\*); do dolib.so ${l} @@ -112,7 +112,7 @@ multilib_src_install() { dosym ${bl} /usr/$(get_libdir)/${bl%.*} done - cd "${BUILD_DIR}" + cd "${BUILD_DIR}" || die insinto /usr/$(get_libdir)/pkgconfig doins *.pc } diff --git a/dev-cpp/tbb/tbb-4.2.20131118.ebuild b/dev-cpp/tbb/tbb-4.3.20150611.ebuild index 8c8203c4a4c7..81f9b0416de2 100644 --- a/dev-cpp/tbb/tbb-4.2.20131118.ebuild +++ b/dev-cpp/tbb/tbb-4.3.20150611.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.2.20131118.ebuild,v 1.2 2014/06/08 08:14:26 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.3.20150611.ebuild,v 1.1 2015/06/15 17:08:07 jlec Exp $ EAPI=5 -inherit eutils flag-o-matic multilib versionator toolchain-funcs + +inherit eutils flag-o-matic multilib-minimal toolchain-funcs versionator PV1="$(get_version_component_range 1)" PV2="$(get_version_component_range 2)" @@ -14,9 +15,8 @@ DESCRIPTION="High level abstract threading library" HOMEPAGE="http://www.threadingbuildingblocks.org/" SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz" LICENSE="GPL-2-with-exceptions" - SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" IUSE="debug doc examples" DEPEND="" @@ -25,36 +25,20 @@ S="${WORKDIR}/${MYP}" src_prepare() { epatch \ - "${FILESDIR}"/${PN}-4.0.297-underlinking.patch - # use fully qualified gcc compilers. do not force march/mcpu - # not tested with icc - # order in sed expressions is important - sed -i \ - -e "s/g++/$(tc-getCXX)/g" \ - -e "s/gcc/$(tc-getCC)/g" \ - -e 's/-m\(arch\|cpu\)=*[[:space:]]//g' \ - -e 's/-\(m\|-\)\(64\|32\)//g' \ - -e 's/-O2/$(CXXFLAGS)/g' \ - -e "/^ASM/s/as/$(tc-getAS)/g" \ - build/*.gcc.inc || die + "${FILESDIR}"/${PN}-4.0.297-underlinking.patch \ + "${FILESDIR}"/${P}-build.patch + + find include -name \*.html -delete || die # Give it a soname on FreeBSD echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >> build/FreeBSD.gcc.inc # Set proper versionning on FreeBSD sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die - # force 64bit where applicable, 32bit where applicable... - # built-in detection is based on running kernel, which messes up - # e.g. in a x86 chroot on amd64 kernel. Bug 462130 - # see build/linux.inc for values - use amd64 && export arch=x86_64 - use amd64-linux && export arch=x86_64 - use x86 && export arch=ia32 - use x86-linux && export arch=ia32 - # no idea what to do with ppc but so far it seems to work - - find include -name \*.html -delete || die + use debug || sed -i -e '/_debug/d' Makefile +} +multilib_src_configure() { # pc files are for debian and fedora compatibility # some deps use them cat <<-EOF > ${PN}.pc.template @@ -67,53 +51,74 @@ src_prepare() { URL: ${HOMEPAGE} Cflags: -I\${includedir} EOF - cp ${PN}.pc.template ${PN}.pc + cp ${PN}.pc.template ${PN}.pc || die cat <<-EOF >> ${PN}.pc Libs: -L\${libdir} -ltbb Libs.private: -lm -lrt EOF - cp ${PN}.pc.template ${PN}malloc.pc + cp ${PN}.pc.template ${PN}malloc.pc || die cat <<-EOF >> ${PN}malloc.pc Libs: -L\${libdir} -ltbbmalloc Libs.private: -lm -lrt EOF - cp ${PN}.pc.template ${PN}malloc_proxy.pc + cp ${PN}.pc.template ${PN}malloc_proxy.pc || die cat <<-EOF >> ${PN}malloc_proxy.pc Libs: -L\${libdir} -ltbbmalloc_proxy Libs.private: -lrt Requires: tbbmalloc EOF - use debug || sed -i -e '/_debug/d' Makefile } -src_compile() { - if [[ $(tc-getCXX) == *g++* ]]; then - comp="gcc" - elif [[ $(tc-getCXX) == *ic*c ]]; then - comp="icc" - else - die "compiler $(tc-getCXX) not supported by build system" - fi - emake compiler=${comp} tbb tbbmalloc +local_src_compile() { + cd "${S}" + + local comp arch + + case ${MULTILIB_ABI_FLAG} in + abi_x86_64) arch=x86_64 ;; + abi_x86_32) arch=ia32 ;; + esac + + case "$(tc-getCXX)" in + *g++*) comp="gcc" ;; + *ic*c) comp="icc" ;; + *clang*) comp="clang" ;; + *) die "compiler $(tc-getCXX) not supported by build system" ;; + esac + + CXX="$(tc-getCXX)" \ + CC="$(tc-getCC)" \ + AS="$(tc-getAS)" \ + arch=${arch} \ + CPLUS_FLAGS="${CXXFLAGS}" \ + emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" $@ +} + +multilib_src_compile() { + local_src_compile tbb tbbmalloc } -src_test() { - append-cxxflags -fabi-version=4 - # avoid oversubscribing with -j1 - emake -j1 compiler=${comp} test +multilib_src_test() { + CXXFLAGS="${CXXFLAGS} -fabi-version=4" \ + local_src_compile -j1 test } -src_install(){ +multilib_src_install() { + cd "${BUILD_DIR}_release" || die local l - for l in $(find build -name lib\*.so.\*); do + for l in $(find . -name lib\*.so.\*); do dolib.so ${l} local bl=$(basename ${l}) dosym ${bl} /usr/$(get_libdir)/${bl%.*} done - doheader -r include/* + cd "${BUILD_DIR}" || die insinto /usr/$(get_libdir)/pkgconfig doins *.pc +} + +multilib_src_install_all() { + doheader -r include/* dodoc README CHANGES doc/Release_Notes.txt use doc && dohtml -r doc/html/* |