summaryrefslogtreecommitdiff
path: root/dev-cpp/tbb
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp/tbb')
-rw-r--r--dev-cpp/tbb/Manifest27
-rw-r--r--dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch38
-rw-r--r--dev-cpp/tbb/files/tbb-2021.4.0-lto.patch249
-rw-r--r--dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch23
-rw-r--r--dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch27
-rw-r--r--dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch25
-rw-r--r--dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch32
-rw-r--r--dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch30
-rw-r--r--dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch43
-rw-r--r--dev-cpp/tbb/tbb-2020.3.ebuild2
-rw-r--r--dev-cpp/tbb/tbb-2021.10.0.ebuild48
-rw-r--r--dev-cpp/tbb/tbb-2021.12.0.ebuild3
-rw-r--r--dev-cpp/tbb/tbb-2021.13.0.ebuild (renamed from dev-cpp/tbb/tbb-2021.11.0.ebuild)3
-rw-r--r--dev-cpp/tbb/tbb-2021.5.0-r1.ebuild55
-rw-r--r--dev-cpp/tbb/tbb-2021.7.0-r1.ebuild2
-rw-r--r--dev-cpp/tbb/tbb-2021.7.0.ebuild40
-rw-r--r--dev-cpp/tbb/tbb-2021.8.0.ebuild49
-rw-r--r--dev-cpp/tbb/tbb-2021.9.0.ebuild3
18 files changed, 53 insertions, 646 deletions
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index f41f489c2adf..67f6f46cb2a8 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,29 +1,16 @@
AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4
AUX tbb-2020.3-gcc13.patch 1384 BLAKE2B 8d4288d8c4597247930949d053bcbc4f6b91f3693a6b2e54b67b2ca6f0c2d4797428654eca0afa3b09d0cd2eff005d553d637cefa962017b80a7af8e0efde49f SHA512 101781458837345c0efc1c3cd7c8d1d517628df190a73a9b8d9de55cb150807cd8c548bdd33ee11a837b07bb6f3b705f4bc4ef5a57a944fe9baa6c34958b1164
-AUX tbb-2021.4.0-lto.patch 9710 BLAKE2B 801b7886af6ec02f118add4607c22b26cfafb14997162d5d4e72ec3b48d6ab5ea03995c6a02957331b65172b2d18d932b59bf655352dcbbc178aa508613681f1 SHA512 d65c84a3246dcf5a7c799fd87566834842adfd104bca2c0b0cbd9e2dcae0b900a189154ca9d9c95351c32ff9014cee15f0eb924228e486b58fdcfc624b12d46b
-AUX tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch 645 BLAKE2B 8a769caed4817413f8e8d11ae3264a75769826989e3815cf24fa856d601ded1ffbd7edd772aa268ca0f8afa15f9fab8bf1deb019635f2355377367814c62d5ce SHA512 d84bed45b82cd63c8afb1f22e2688a7e298014997fa3d1107d7a91b1d4a0f7a54a42cfa38841a051c6a0ca6721182584472f34362c97edba02e3131c77230545
-AUX tbb-2021.5.0-flags-stripping.patch 1078 BLAKE2B 32b5463980ae8841ce551caffb91d5bb20a70af4d93d6c0d9e45bd235f3948599c42fa779eb4c53a6994275d827c0074dab8cb2e66313989a1ffe067e48b12c3 SHA512 22460e212ea506bfd13765eb9557d21cb19d4fd9f42e195ed36f12aabd6e9b4c24a218a5bcb55894f45ce0f118de89287751913d386931bd9cda3a389bc04345
-AUX tbb-2021.5.0-musl-deepbind.patch 982 BLAKE2B a605db66a697ce4cf826448ea843529464b224882708c26623acdaa573a07ca157d562c0e03e12dc8480871f3327daca144a0bc238a5a15421b17966c429c9fd SHA512 6a6deca9d6ac037704e75abaf1544627c369057636214fa0a9c573fc190900226fab3760d8b5afe3ac7ac456bdaa105f0912173d054fe2eaa6dcdbadcb9822d1
-AUX tbb-2021.5.0-musl-mallinfo.patch 931 BLAKE2B 7e77b6bed7d0a8422e45499317fd02ea080e94575e96c0610e1503633a296855095b675be1b679d4b97c8e50e72736d71582c30a91d7630c02b0c98996d2abb2 SHA512 21555821262a29b904ff3c0c8a023459c5c2ae0df11d17e0e2ec36d680016a0a2c4808ad257e1a3fabd78046e5ac795f5906aed129c35e40c257251957722723
-AUX tbb-2021.5.0-musl-setcontext.patch 1409 BLAKE2B b7dbb2379cdf8c27fe704850e9ef9d9630719c3031d7f5591e973648c5e299f90b25684aab7af95a56038dde3e490e6711f5a443e016404129d92de549f9c55e SHA512 558c917326408818cd0c1d8169fd958533dab9470e2a04621ff396de61c8a371a68c9f4a2d9f1e91ed79bd57605be3208e4e473e80cb3f38db526a673ff3468d
-AUX tbb-2021.5.0-x86-mwaitpkg.patch 1975 BLAKE2B d072f7dfa7f1fbe5986c409147419d782abd1c21e602a8555a696833c7c919f2e6996f8a2fd1e61fb6d3ccdf00f0ce5ee9b78ad53770a06f632cb6029bb74029 SHA512 de952018c2b82634f02f38754d0cb92d31229b9546a135ac54d43b53ad2d0a74ba3bd02946e856c29455438e539a0cf5bc3fb4eae35aa0774baa1faf723e8b61
+AUX tbb-2021.13.0-test-atomics.patch 1391 BLAKE2B 96d18091c1df00c2ae4dbbc341a727559a3137e940a2c90efb8bd218f63b0376451b58ed1c0f5ef8a3711c48c82d7fff83eb07443a92736a6e50d942d8071f5c SHA512 0d155b182ef85437dfa16021b5cee12fa6534318a4890c08cb107826f0ebb327385dd540a094399ce53e91211fed16983a359eeabb01d04dc7d2445cf49c638e
AUX tbb-2021.7.0-pthread-eagain.patch 4515 BLAKE2B d5a2d3d5dc0a4607227f03200901985fa823a6be2817c34e58e166e639f1f294a2ab65407140a8b4423e30d217fa3c04a4493dd3e4849d77877473002006870c SHA512 bfbac70acc603796f93c7712017700fa1de99cd1aa984f8015863f66ca6caaa03e5c4705dfc42c1af7592bc5b05b7ba9b48df7e5686d27f4ce67c53b954775cf
AUX tbb-2021.8.0-gcc-13.patch 735 BLAKE2B d67ab028669cae808058d68c74ec4ef7477641afc025e9c5e3ce59912571330c2e3cc85b7fd25db2a7a084a1f05a82794ccd48c3f5f72a1c0893535de250f038 SHA512 ad9547149a68ab0ab78c28413d85b2496fcaf9d94b0ec48b4d723374092230ab4ed1b6d32cd05a63d8046036ed8f2c68cd91f38585e4dab6839e81383580a8d6
DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
-DIST tbb-2021.10.0.tar.gz 2598088 BLAKE2B ba8352474b97c3d98b534cbfd8f61af165352967529f19226dbae17f17d20a8b5dfd7a3b29bab85431620cea1ee1c5990ec7311cc9b1b865d6aa1800540dd6d0 SHA512 d71cf317e7f78948c1ea20977cfcfba1eff72cb20c457c87e624cb3aaa3215a1c24eeeec11ed6ed99cf118c577d956234202458bb5e0215c9c317099d9c3b732
-DIST tbb-2021.11.0.tar.gz 2613493 BLAKE2B 2b56042c8126709b6f36c1118685b28ddf2ff39b6563aae168d6bb8106d234757ff125a39da37f907a7da62f2f2ad64e4db01ca028d20c1e74def4ba2e92c1a6 SHA512 4779141b7602f2fa3a509fdd346824ba270a3a568df3649ce8cb51264d233df5cec5e5cb67b91319dd11d3d5e054697b4ed345e07216107985ddb6e1e7ef94e5
DIST tbb-2021.12.0.tar.gz 2617255 BLAKE2B 3e1db8b1972a7225c5355def66ae40006e6e0f0f97e2efff45dd361f724e348a2f0476bc14b59f89f5361cac6fa36a4973602467bc7fbb2b8b139a4ff4dd58de SHA512 64022bcb61cf7b2030a1bcc11168445ef9f0d69b70290233a7febb71cc7a12cc2282dddc045f84e30893efe276342f02fd78d176706268eeaefe9aac7446d4e9
-DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
+DIST tbb-2021.13.0.tar.gz 2613916 BLAKE2B 0edd2d8a966dba673e50827629491924140a302430f4380e7cd9914f3592eaf6515204c7267649237970a5482cc030f0c29cbddd1476f16caf46989f70041058 SHA512 1f536b98c4eb331c3ba21e4b36362c932d7852b974ea7237b5f7bffb0e996d76f688c7ac534cb56f5866cfdffd5d3f015521b4c2ca21e584503070782ca82a2f
DIST tbb-2021.7.0.tar.gz 2571727 BLAKE2B 2977ef1a33d9bc7baa40e0e57c02e62798a09c6c66cdbe369f2702d87fd9877c3d97f8d83f71384028995ea0956f5c5630d4aaf4edbe68538e7c514d3b87085c SHA512 d314e3d88b85c96607a9eda15e3d808bf361eb562a534c59101929236e90c187883e7718e5435b5e7f01f4ee652c9765af95f5f173368b83997e4666b7403a49
-DIST tbb-2021.8.0.tar.gz 2575336 BLAKE2B 2c3a7f0e59d70b17550f805461a15a520c7f1b3a37a41bd51c51f9f5863b50812d2b939351e11e0f4ceb3da8a47e413abe171bcb6bfb71c0fe2f81ed373f65f2 SHA512 72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4
DIST tbb-2021.9.0.tar.gz 2579150 BLAKE2B f6f701df1605913770222689063ff422416f86f132fb3fbc80f383b7c52762d3804e75200ca4826906b16c66f674918bcfd78b16a1dafb499ca53a9d2b6652ec SHA512 2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c
-EBUILD tbb-2020.3.ebuild 3437 BLAKE2B 16b92e3a47f6ff29b92163d589f90fed7cffa31f1e2d1f4e81c1e06cdf184401662be048beafa20caf924e777424b8186dc35393a4b8edbf2f5cde75d96040ef SHA512 11ef97cd4d8ce9f7f6b5cc235c13106e03d218d88ba52ea2776ef3f2e186adbf5b2f081a856b086e6d3184b4469d130f23636acec4a662a803e8e6a6dbdd4c44
-EBUILD tbb-2021.10.0.ebuild 1373 BLAKE2B 55884f50fce48432b098ac6ac8b4f1111db584dcb0fd8b97a47c432a031d401a64aa0e47a9e530f51d79fc366a1445d0b489f74b3f7b4a8a45fcaadf3a74c4d7 SHA512 0371109aeeb690b5325abd9a8fb62b6246da916807ba11b3bcd916659f35ccfd95f7f596aaaf7e6f7d588e87a915a06d5a164f0033e547e6fcfccf5b47aedce1
-EBUILD tbb-2021.11.0.ebuild 1373 BLAKE2B 8ffdd8f4c0fa0be004647dfc8bc6c14c154b3e3c1963a4c8e3a05fab58162957321457dd679fbce184ef738ad448ef4cd8c28ff3fb19aaa5d99445459db46258 SHA512 95a06feac192edac1b5cda90413b9b1aa045869acaf46c32dd69572ebf564c3ec23f54793b46a4b8fb924a1e9df645eab569db7e97b6e9a459872dc736926e14
-EBUILD tbb-2021.12.0.ebuild 1373 BLAKE2B 8ffdd8f4c0fa0be004647dfc8bc6c14c154b3e3c1963a4c8e3a05fab58162957321457dd679fbce184ef738ad448ef4cd8c28ff3fb19aaa5d99445459db46258 SHA512 95a06feac192edac1b5cda90413b9b1aa045869acaf46c32dd69572ebf564c3ec23f54793b46a4b8fb924a1e9df645eab569db7e97b6e9a459872dc736926e14
-EBUILD tbb-2021.5.0-r1.ebuild 1618 BLAKE2B f382a29be9b11a662e9f90b501c589da661a90ff0078a2f77a53f56f310748a74905f6ac5ef2ef9eda4b1ab44c02820ff2fbff1868cc6c30ee9e70e42672cbc5 SHA512 198135a64c94e5665cf172dd4c0dc07b9155bf070451c6aaa56ffeaf37c5bd1512bae15591c122f8ef73855c3189b816561ba27bb90831dd33b0e6c583174fdd
-EBUILD tbb-2021.7.0-r1.ebuild 1092 BLAKE2B 449710ffde68b12225ac8bccd749f54abda65e6764339cdc56b855e2fceb084362971302d1f9bbc6c8742cbdccb430d02b9fe0babfa46a3d5f3c246c679efe8d SHA512 a4af6752b60e17c22215f2455643e3ebc3440dadc058196f0482fdde08bbf95184ad1fdf9fb3f6409287d6406c3b4803fd30c0a1b349fffdc9bf10a4db14ed52
-EBUILD tbb-2021.7.0.ebuild 1112 BLAKE2B fd19a921be35faeb73ab5bf64a124e02055da4b52b9fbdc4f23eb1131042260d562016fff0a91e3ef9dc53a864ca5d6ebd33b2b2cc5b677bd600eebf740dd70d SHA512 e9d46e652ca21812fcbfb9e2d37967167c72bb45c5d246c10977fb2b80c129ce24525647abf34a491f797a673e349b600badb6783a327301bede83c0b5173cb0
-EBUILD tbb-2021.8.0.ebuild 1424 BLAKE2B 1600ce57224eaf970b53fbca75fceca6746571765df9c7a652f4e1b463b3f05d2c8dc010020c4d397e9af0398638ed2b07e5fefa72436a21b8ec07623f567ce6 SHA512 71c1c13df0b806bfda979ff617eebe81c62355b8a1f8d9094f3c48f333a7a616bbad80b658788cefe19c46ed205476b597b76e6186eba173533e79234dd68a77
-EBUILD tbb-2021.9.0.ebuild 1368 BLAKE2B 893d9b7b964e0bd1d2715170765c0045ac4d019a69f8a9318c07888545dc9d86276bc77d33470a4c295883d4fbb78fa518e03f56fb67d2578761d57fe75d3af2 SHA512 dc9419acda9ba55cf4f7369d337dfe2aaa3dcff3e640d23175dc2bd38679c1e376f2771e94f8c93210c1c1fc9e123fd3f9e8a0b028799f3fdaa1a42e1be49cdd
+EBUILD tbb-2020.3.ebuild 3431 BLAKE2B b283e9afa2d918f8915d3e8f3e5f8a9730ab8424bd1587393c5e6254e1a2b767b7c0fecc0997f3970b37bab499bff13943cf099547b4da664a12b0c9f5bc5816 SHA512 b4b51539006965353ff8759dfad12053071db5cfb8479bea1b0c5f9c58d22d70d12859e13412959844a7104744454a0290a46aff332040c0af15a6d09423306a
+EBUILD tbb-2021.12.0.ebuild 1417 BLAKE2B 2af0947eb0bc96fbda1ef7c48731fbd62836d0a9ff14baee03732ffb69dabaf166814812ece873c0993f1510672a19774e858fa20f1af857bad9f11bc9f3d631 SHA512 4f3045557f16df3c6963f0a9d157c178cbdcecca56b7d1abcf29001e750cd43c77dbf4ba5cf8056d6ba00026572930dfc4049c906878ce9385309724659708aa
+EBUILD tbb-2021.13.0.ebuild 1417 BLAKE2B 2af0947eb0bc96fbda1ef7c48731fbd62836d0a9ff14baee03732ffb69dabaf166814812ece873c0993f1510672a19774e858fa20f1af857bad9f11bc9f3d631 SHA512 4f3045557f16df3c6963f0a9d157c178cbdcecca56b7d1abcf29001e750cd43c77dbf4ba5cf8056d6ba00026572930dfc4049c906878ce9385309724659708aa
+EBUILD tbb-2021.7.0-r1.ebuild 1086 BLAKE2B c513c44a8d03d23986f7fb2d636f081e9b9e5c46fec30f63ba91dda7af6f62a90b92a2e8bcaca07be0da4ec9e4230628fad6bde8aeadbb7c05e75e9267d542b8 SHA512 4b37456c7d580f7717cebd522cb0934c1303971333a12d9e905dcdb302987d3cb9fa62a66e9d2a29088e60edabac58d8708b3d3ba2250ca12162ddd61c0afb11
+EBUILD tbb-2021.9.0.ebuild 1425 BLAKE2B c303fc9f13ff1d35e6338a16fdf26345beab1e341427932b557eef04867e6849f3d6dbe4909e60aeaedd06f912cf88757a8be41dbba63ca272d9b77728e674f5 SHA512 2a25e8ab9509bfc4b81c104fbc04c28721cb1526e447b9e489e6f8a77e427aeb8c5beff6e0a82c602a0e2cdebc5d2566844dac5e8355da4d6d927c99ce7cf38e
MISC metadata.xml 696 BLAKE2B b8003afd9cf4ef7a07aab27f5a5263604fd32ca98ade51ed5a3872a53ea45c2151a49b0a9bd997219a58ef4e37ff4c969df716ee7e9987bf43c9fbc132dca245 SHA512 b95aad151a300ae292c519d7d792e2b4bdf471ef786c77904e279a203a4ebb24514177a1a8663abdf2ea6899c63e007dbc7a69cf1c0b53f6e3d3b486d66243d7
diff --git a/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch b/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch
new file mode 100644
index 000000000000..7cc8216153d0
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.13.0-test-atomics.patch
@@ -0,0 +1,38 @@
+From c828ae47b8f4bea7736d2f9d05460e2b529c9d7d Mon Sep 17 00:00:00 2001
+From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+Date: Fri, 9 Dec 2022 12:36:11 +0100
+Subject: [PATCH] Add cmake check for libatomic requirement when building with
+ gcc (#980)
+
+Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+---
+ cmake/compilers/GNU.cmake | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
+index cd76acfe1e..59f4e6934f 100644
+--- a/cmake/compilers/GNU.cmake
++++ b/cmake/compilers/GNU.cmake
+@@ -44,6 +44,22 @@ if (NOT MINGW)
+ set(TBB_COMMON_LINK_LIBS dl)
+ endif()
+
++# Check whether code with full atomics can be built without libatomic
++# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
++include(CheckCXXSourceCompiles)
++check_cxx_source_compiles("#include <atomic>
++int main() {
++ std::atomic<uint8_t> w1;
++ std::atomic<uint16_t> w2;
++ std::atomic<uint32_t> w4;
++ std::atomic<uint64_t> w8;
++ return ++w1 + ++w2 + ++w4 + ++w8;
++}" TBB_BUILDS_WITHOUT_LIBATOMIC)
++
++if(NOT TBB_BUILDS_WITHOUT_LIBATOMIC)
++ set(TBB_COMMON_LINK_LIBS ${TBB_COMMON_LINK_LIBS} atomic)
++endif()
++
+ # Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
+ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
+ tbb_remove_compile_flag(-Werror)
diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch b/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
deleted file mode 100644
index 1c9705576004..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.4.0-lto.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-https://github.com/oneapi-src/oneTBB/pull/608
-
-From 6feeba8035ea2bdf652d473a35730b19427752db Mon Sep 17 00:00:00 2001
-From: Ivan Kochin <kochin.ivan@intel.com>
-Date: Wed, 27 Oct 2021 17:23:32 +0300
-Subject: [PATCH] Use native CMake way to detect the IPO support (#608)
-
-* Use native CMake way to detect the IPO support
-
-Signed-off-by: Kochin Ivan <kochin.ivan@intel.com>
----
- CMakeLists.txt | 17 +++++++++++++++++
- cmake/README.md | 1 +
- cmake/compilers/Clang.cmake | 8 ++------
- cmake/compilers/GNU.cmake | 8 +++-----
- cmake/compilers/MSVC.cmake | 1 +
- cmake/utils.cmake | 13 +++++++++++++
- src/tbb/CMakeLists.txt | 5 ++---
- src/tbbbind/CMakeLists.txt | 6 +++---
- src/tbbmalloc/CMakeLists.txt | 5 ++---
- 9 files changed, 44 insertions(+), 20 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13b1dbc2c..4dbdadb97 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -103,6 +103,7 @@ option(TBBMALLOC_BUILD "Enable tbbmalloc build" ON)
- option(TBB_CPF "Enable preview features of the library" OFF)
- option(TBB_FIND_PACKAGE "Enable search for external oneTBB using find_package instead of build from sources" OFF)
- option(TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH "Disable HWLOC automatic search by pkg-config tool" OFF)
-+option(TBB_ENABLE_IPO "Enable Interprocedural Optimization (IPO) during the compilation" ON)
-
- if (NOT DEFINED BUILD_SHARED_LIBS)
- set(BUILD_SHARED_LIBS ON)
-@@ -181,6 +182,22 @@ foreach(FILE_WITH_EXTRA_TARGETS ${FILES_WITH_EXTRA_TARGETS})
- include(${FILE_WITH_EXTRA_TARGETS})
- endforeach()
-
-+# - Enabling LTO on Android causes the NDK bug.
-+# NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'"
-+# - For some reason GCC does not instrument code with Thread Sanitizer when lto is enabled and C linker is used.
-+if (TBB_ENABLE_IPO AND BUILD_SHARED_LIBS AND NOT ANDROID_PLATFORM AND NOT TBB_SANITIZE MATCHES "thread")
-+ if (NOT CMAKE_VERSION VERSION_LESS 3.9)
-+ cmake_policy(SET CMP0069 NEW)
-+ include(CheckIPOSupported)
-+ check_ipo_supported(RESULT TBB_IPO_PROPERTY)
-+ else()
-+ set(TBB_IPO_FLAGS TRUE)
-+ endif()
-+ if (TBB_IPO_PROPERTY OR TBB_IPO_FLAGS)
-+ message(STATUS "IPO enabled")
-+ endif()
-+endif()
-+
- set(TBB_COMPILER_SETTINGS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compilers/${CMAKE_CXX_COMPILER_ID}.cmake)
- if (EXISTS ${TBB_COMPILER_SETTINGS_FILE})
- include(${TBB_COMPILER_SETTINGS_FILE})
-diff --git a/cmake/README.md b/cmake/README.md
-index ec56e423c..ed1631de3 100644
---- a/cmake/README.md
-+++ b/cmake/README.md
-@@ -16,6 +16,7 @@ TBB_CPF:BOOL - Enable preview features of the library (OFF by default)
- TBB_INSTALL_VARS:BOOL - Enable auto-generated vars installation(packages generated by `cpack` and `make install` will also include the vars script)(OFF by default)
- TBB_VALGRIND_MEMCHECK:BOOL - Enable scan for memory leaks using Valgrind (OFF by default)
- TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH - Disable HWLOC automatic search by pkg-config tool (OFF by default)
-+TBB_ENABLE_IPO - Enable Interprocedural Optimization (IPO) during the compilation (ON by default)
- ```
-
- ## Configure, build and test
-diff --git a/cmake/compilers/Clang.cmake b/cmake/compilers/Clang.cmake
-index 183341fcc..69aa51932 100644
---- a/cmake/compilers/Clang.cmake
-+++ b/cmake/compilers/Clang.cmake
-@@ -58,12 +58,8 @@ if (MINGW)
- list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__)
- endif()
-
--# Enabling LTO on Android causes the NDK bug.
--# NDK throws the warning: "argument unused during compilation: '-Wa,--noexecstack'"
--if (NOT ANDROID_PLATFORM AND BUILD_SHARED_LIBS)
-- set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-- set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
--endif()
-+set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-+set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-
- # TBB malloc settings
- set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions)
-diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
-index fa14c869e..a9cfa8927 100644
---- a/cmake/compilers/GNU.cmake
-+++ b/cmake/compilers/GNU.cmake
-@@ -63,11 +63,9 @@ if (MINGW)
- list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__)
- endif()
-
--# For some reason GCC does not instrument code with Thread Sanitizer when lto is enabled and C linker is used.
--if (NOT TBB_SANITIZE MATCHES "thread")
-- set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-- set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
--endif()
-+set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-+set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-+
-
- # TBB malloc settings
- set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions)
-diff --git a/cmake/compilers/MSVC.cmake b/cmake/compilers/MSVC.cmake
-index 3447418cc..5767235a0 100644
---- a/cmake/compilers/MSVC.cmake
-+++ b/cmake/compilers/MSVC.cmake
-@@ -77,6 +77,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
- endif()
- set(TBB_OPENMP_NO_LINK_FLAG TRUE)
- set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-+ set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
- else()
- set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:/GL>)
- set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-LTCG> $<$<NOT:$<CONFIG:Debug>>:-INCREMENTAL:NO>)
-diff --git a/cmake/utils.cmake b/cmake/utils.cmake
-index 06d3a9aee..f74abfcf9 100644
---- a/cmake/utils.cmake
-+++ b/cmake/utils.cmake
-@@ -44,3 +44,16 @@ macro(tbb_install_target target)
- COMPONENT devel)
- endif()
- endmacro()
-+
-+macro(tbb_handle_ipo target)
-+ if (TBB_IPO_PROPERTY)
-+ set_target_properties(${target} PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
-+ elseif (TBB_IPO_FLAGS)
-+ target_compile_options(${target} PRIVATE ${TBB_IPO_COMPILE_FLAGS})
-+ if (COMMAND target_link_options)
-+ target_link_options(${target} PRIVATE ${TBB_IPO_LINK_FLAGS})
-+ else()
-+ target_link_libraries(${target} PRIVATE ${TBB_IPO_LINK_FLAGS})
-+ endif()
-+ endif()
-+endmacro()
-diff --git a/src/tbb/CMakeLists.txt b/src/tbb/CMakeLists.txt
-index 80fdcdcde..021392d89 100644
---- a/src/tbb/CMakeLists.txt
-+++ b/src/tbb/CMakeLists.txt
-@@ -79,7 +79,6 @@ target_compile_options(tbb
- ${TBB_WARNING_SUPPRESS}
- ${TBB_LIB_COMPILE_FLAGS}
- ${TBB_COMMON_COMPILE_FLAGS}
-- ${TBB_IPO_COMPILE_FLAGS}
- )
-
- # Avoid use of target_link_libraries here as it changes /DEF option to \DEF on Windows.
-@@ -89,6 +88,8 @@ set_target_properties(tbb PROPERTIES
- SOVERSION ${TBB_BINARY_VERSION}
- )
-
-+tbb_handle_ipo(tbb)
-+
- if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives
- set_target_properties(tbb PROPERTIES
- LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbb.def
-@@ -103,14 +104,12 @@ if (COMMAND target_link_options)
- PRIVATE
- ${TBB_LIB_LINK_FLAGS}
- ${TBB_COMMON_LINK_FLAGS}
-- ${TBB_IPO_LINK_FLAGS}
- )
- else()
- target_link_libraries(tbb
- PRIVATE
- ${TBB_LIB_LINK_FLAGS}
- ${TBB_COMMON_LINK_FLAGS}
-- ${TBB_IPO_LINK_FLAGS}
- )
- endif()
-
-diff --git a/src/tbbbind/CMakeLists.txt b/src/tbbbind/CMakeLists.txt
-index 99b7ccaac..3233ec718 100644
---- a/src/tbbbind/CMakeLists.txt
-+++ b/src/tbbbind/CMakeLists.txt
-@@ -46,7 +46,6 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
- ${TBB_WARNING_LEVEL}
- ${TBB_LIB_COMPILE_FLAGS}
- ${TBB_COMMON_COMPILE_FLAGS}
-- ${TBB_IPO_COMPILE_FLAGS}
- )
-
- # Avoid use of target_link_libraries here as it changes /DEF option to \DEF on Windows.
-@@ -55,6 +54,9 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
- VERSION ${TBBBIND_BINARY_VERSION}.${TBB_BINARY_MINOR_VERSION}
- SOVERSION ${TBBBIND_BINARY_VERSION}
- )
-+
-+ tbb_handle_ipo(${TBBBIND_NAME})
-+
- if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives
- set_target_properties(${TBBBIND_NAME} PROPERTIES
- LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbbind.def
-@@ -69,14 +71,12 @@ function(tbbbind_build TBBBIND_NAME REQUIRED_HWLOC_TARGET)
- PRIVATE
- ${TBB_LIB_LINK_FLAGS}
- ${TBB_COMMON_LINK_FLAGS}
-- ${TBB_IPO_LINK_FLAGS}
- )
- else()
- target_link_libraries(${TBBBIND_NAME}
- PRIVATE
- ${TBB_LIB_LINK_FLAGS}
- ${TBB_COMMON_LINK_FLAGS}
-- ${TBB_IPO_LINK_FLAGS}
- )
- endif()
-
-diff --git a/src/tbbmalloc/CMakeLists.txt b/src/tbbmalloc/CMakeLists.txt
-index f77bc8f10..5a851851f 100644
---- a/src/tbbmalloc/CMakeLists.txt
-+++ b/src/tbbmalloc/CMakeLists.txt
-@@ -59,7 +59,6 @@ target_compile_options(tbbmalloc
- ${TBB_LIB_COMPILE_FLAGS}
- ${TBBMALLOC_LIB_COMPILE_FLAGS}
- ${TBB_COMMON_COMPILE_FLAGS}
-- ${TBB_IPO_COMPILE_FLAGS}
- )
-
- enable_language(C)
-@@ -72,6 +71,8 @@ set_target_properties(tbbmalloc PROPERTIES
- LINKER_LANGUAGE C
- )
-
-+tbb_handle_ipo(tbbmalloc)
-+
- if (TBB_DEF_FILE_PREFIX) # If there's no prefix, assume we're using export directives
- set_target_properties(tbbmalloc PROPERTIES
- LINK_FLAGS ${TBB_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_SOURCE_DIR}/def/${TBB_DEF_FILE_PREFIX}-tbbmalloc.def
-@@ -88,14 +89,12 @@ if (COMMAND target_link_options)
- PRIVATE
- ${TBB_LIB_LINK_FLAGS}
- ${TBB_COMMON_LINK_FLAGS}
-- ${TBB_IPO_LINK_FLAGS}
- )
- else()
- target_link_libraries(tbbmalloc
- PRIVATE
- ${TBB_LIB_LINK_FLAGS}
- ${TBB_COMMON_LINK_FLAGS}
-- ${TBB_IPO_LINK_FLAGS}
- )
- endif()
-
diff --git a/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch b/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch
deleted file mode 100644
index 091cad5821e7..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/oneapi-src/oneTBB/issues/186
-https://github.com/oneapi-src/oneTBB/pull/550
-https://bugs.gentoo.org/827883
-
-From: Felix Yan <felixonmars@archlinux.org>
-Date: Thu, 7 Oct 2021 14:16:16 +0800
-Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550)
-
-Upstream-Status: Merged in commit later than 2021.5.0
-
---- a/src/tbb/tools_api/ittnotify_config.h
-+++ b/src/tbb/tools_api/ittnotify_config.h
-@@ -147,6 +147,10 @@
- # define ITT_ARCH_IA32E 2
- #endif /* ITT_ARCH_IA32E */
-
-+#ifndef ITT_ARCH_IA64
-+# define ITT_ARCH_IA64 3
-+#endif /* ITT_ARCH_IA64 */
-+
- #ifndef ITT_ARCH_ARM
- # define ITT_ARCH_ARM 4
- #endif /* ITT_ARCH_ARM */
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
deleted file mode 100644
index 4252ea446423..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/oneapi-src/oneTBB/pull/716
-
-From 9595b9699ae6863d1e0cf770a89728eafcaf8845 Mon Sep 17 00:00:00 2001
-From: Christoph Erhardt <github@sicherha.de>
-Date: Wed, 5 Jan 2022 15:13:32 +0100
-Subject: [PATCH] Fix overeager stripping of compile flag
-
-The existing regex strips all occurrences of the given string from
-`${CMAKE_CXX_FLAGS}`, regardless of whether it is just a substring of a
-flag. For instance, `-Werror=format-security` gets truncated to
-`=format-security`.
-
-The new regex makes sure that only whole words get replaced.
-
-Signed-off-by: Christoph Erhardt <github@sicherha.de>
---- a/cmake/utils.cmake
-+++ b/cmake/utils.cmake
-@@ -18,7 +18,7 @@ macro(tbb_remove_compile_flag flag)
- set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS ${_tbb_compile_options})
- unset(_tbb_compile_options)
- if (CMAKE_CXX_FLAGS)
-- string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-+ string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
- endif()
- endmacro()
-
-
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch
deleted file mode 100644
index 014a3863f452..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/oneapi-src/oneTBB/commit/883c2e5245c39624b3b5d6d56d5b203cf09eac38
-https://bugs.gentoo.org/830698
-
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 Dec 2021 08:08:07 -0800
-Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND (#684)
-
-Exclude non-glibc linux systems along with android
-Fixes
-src/tbb/dynamic_link.cpp:417:29: error: use
- of undeclared identifier 'RTLD_DEEPBIND' | flags = flags | RTLD_DEEPBIND;
-| ^
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/src/tbb/dynamic_link.cpp
-+++ b/src/tbb/dynamic_link.cpp
-@@ -413,7 +413,7 @@ namespace r1 {
- int flags = RTLD_NOW;
- if (local_binding) {
- flags = flags | RTLD_LOCAL;
--#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
-+#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
- flags = flags | RTLD_DEEPBIND;
- #endif
- } else {
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch
deleted file mode 100644
index e46c16f42f59..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.5.0-musl-mallinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch
-https://github.com/oneapi-src/oneTBB/pull/203
-https://bugs.gentoo.org/828704
-
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 7 Apr 2021 11:14:13 +0800
-Subject: [PATCH] mallinfo() is glibc specific API mark it so
-
-Helps compiling with musl
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---- a/src/tbbmalloc_proxy/proxy.cpp
-+++ b/src/tbbmalloc_proxy/proxy.cpp
-@@ -260,6 +260,7 @@ int mallopt(int /*param*/, int /*value*/
- return 1;
- }
-
-+#ifdef __GLIBC__
- struct mallinfo mallinfo() __THROW
- {
- struct mallinfo m;
-@@ -267,6 +268,7 @@ struct mallinfo mallinfo() __THROW
-
- return m;
- }
-+#endif
-
- #if __ANDROID__
- // Android doesn't have malloc_usable_size, provide it to be compatible
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch
deleted file mode 100644
index 111bbf123d9a..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.5.0-musl-setcontext.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/832700
-https://github.com/oneapi-src/oneTBB/commit/6a15b64093c51ddc00bdf4a6b49d4bbec1574a12
-
-From: Rui Ueyama <rui314@gmail.com>
-Date: Fri, 4 Feb 2022 19:32:11 +0900
-Subject: [PATCH] Make tbb compile with musl libc (#748)
-
-TBB resumable tasks are implemented using getcontext() and setcontext()
-on Unix-like systems. These functions are deprecated in the recent
-versions of POSIX and may not exist. musl libc does not provide these
-functions.
-
-There's unfortunately no way to detect musl (musl intentionally do not
-define macros like `__MUSL__`), so __TBB_RESUMABLE_TASKS is defined if
-`__GLIBC__`. glibc-compatible libc's such as uClibc defines `__GLIBC__`,
-so it should work as a catch-all condition.
-
-Signed-off-by: Rui Ueyama <ruiu@cs.stanford.edu>
---- a/include/oneapi/tbb/detail/_config.h
-+++ b/include/oneapi/tbb/detail/_config.h
-@@ -268,7 +268,7 @@
- #define __TBB_CPP20_COMPARISONS_PRESENT __TBB_CPP20_PRESENT
- #endif
-
--#define __TBB_RESUMABLE_TASKS (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__)
-+#define __TBB_RESUMABLE_TASKS (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__ && (!__linux__ || __GLIBC__))
-
- /* This macro marks incomplete code or comments describing ideas which are considered for the future.
- * See also for plain comment with TODO and FIXME marks for small improvement opportunities.
-
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
deleted file mode 100644
index 83f119a9acd3..000000000000
--- a/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/oneapi-src/oneTBB/pull/609
-https://github.com/oneapi-src/oneTBB/issues/370
-https://bugs.gentoo.org/842762
-
-From 542a27fa1cfafaf76772e793549d9f4d288d03a9 Mon Sep 17 00:00:00 2001
-From: Ilya Isaev <ilya.isaev@intel.com>
-Date: Fri, 8 Oct 2021 10:18:16 +0300
-Subject: [PATCH] Detect 32 bit x86 systems while adding -mwaitpkg option
-
-Signed-off-by: Ilya Isaev <ilya.isaev@intel.com>
---- a/cmake/compilers/Clang.cmake
-+++ b/cmake/compilers/Clang.cmake
-@@ -44,7 +44,7 @@ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
- endif()
-
- # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
--if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
-+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
- set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
- endif()
-
---- a/cmake/compilers/GNU.cmake
-+++ b/cmake/compilers/GNU.cmake
-@@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
- endif()
-
- # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
--if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
-+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
- set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
- endif()
-
---- a/cmake/compilers/MSVC.cmake
-+++ b/cmake/compilers/MSVC.cmake
-@@ -72,7 +72,7 @@ if (TBB_WINDOWS_DRIVER)
- endif()
-
- if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
-- if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
-+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
- set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg)
- endif()
- set(TBB_OPENMP_NO_LINK_FLAG TRUE)
diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index 36dc24e44018..a4a8523b1c41 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/oneapi-src/oneTBB"
SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug examples"
S="${WORKDIR}/oneTBB-${MY_PV}"
diff --git a/dev-cpp/tbb/tbb-2021.10.0.ebuild b/dev-cpp/tbb/tbb-2021.10.0.ebuild
deleted file mode 100644
index 3d0e05e45514..000000000000
--- a/dev-cpp/tbb/tbb-2021.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://github.com/oneapi-src/oneTBB"
-SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oneTBB-${PV}"
-
-LICENSE="Apache-2.0"
-# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
-# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
-SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
-)
-
-src_prepare() {
- # Workaround for bug #912210
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- # Has an #error to force compilation as C but links with C++ library, dies
- # with GLIBCXX_ASSERTIONS as a result.
- sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' test/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DTBB_TEST=$(usex test)
- -DTBB_ENABLE_IPO=OFF
- -DTBB_STRICT=OFF
- )
-
- cmake-multilib_src_configure
-}
diff --git a/dev-cpp/tbb/tbb-2021.12.0.ebuild b/dev-cpp/tbb/tbb-2021.12.0.ebuild
index 3ac69c080835..c4ce0e2090fb 100644
--- a/dev-cpp/tbb/tbb-2021.12.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.12.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
+ "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch
)
src_prepare() {
diff --git a/dev-cpp/tbb/tbb-2021.11.0.ebuild b/dev-cpp/tbb/tbb-2021.13.0.ebuild
index 3ac69c080835..c4ce0e2090fb 100644
--- a/dev-cpp/tbb/tbb-2021.11.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.13.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
+ "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch
)
src_prepare() {
diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
deleted file mode 100644
index adb066b4c2d9..000000000000
--- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://github.com/oneapi-src/oneTBB"
-SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oneTBB-${PV}"
-
-LICENSE="Apache-2.0"
-# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
-# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
-SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- # should be in.. 2022?
- "${FILESDIR}"/${PN}-2021.4.0-lto.patch
- "${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch
- # bug 827883
- "${FILESDIR}"/${PN}-2021.4.0-missing-TBB_machine_fetchadd4.patch
- # need to verify this is in master
- "${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
- # musl again, should be in.. 2022?
- "${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch
- # should be in.. 2022?
- "${FILESDIR}"/${PN}-2021.5.0-x86-mwaitpkg.patch
-
- "${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch
-)
-
-src_configure() {
- # Workaround for bug #912210
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- # Workaround for bug #912210
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- local mycmakeargs=(
- -DTBB_TEST=$(usex test)
- -DTBB_ENABLE_IPO=OFF
- -DTBB_STRICT=OFF
- )
-
- cmake-multilib_src_configure
-}
diff --git a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
index dd9c26717c7e..4ce310a4a962 100644
--- a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/tbb/tbb-2021.7.0.ebuild b/dev-cpp/tbb/tbb-2021.7.0.ebuild
deleted file mode 100644
index 972e90e1702f..000000000000
--- a/dev-cpp/tbb/tbb-2021.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://github.com/oneapi-src/oneTBB"
-SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oneTBB-${PV}"
-
-LICENSE="Apache-2.0"
-# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
-# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
-SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
- # Workaround for bug #912210
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- # bug #872287
- filter-flags -D_GLIBCXX_ASSERTIONS
- append-cppflags -U_GLIBCXX_ASSERTIONS
-
- local mycmakeargs=(
- -DTBB_TEST=$(usex test)
- -DTBB_ENABLE_IPO=OFF
- -DTBB_STRICT=OFF
- )
-
- cmake-multilib_src_configure
-}
diff --git a/dev-cpp/tbb/tbb-2021.8.0.ebuild b/dev-cpp/tbb/tbb-2021.8.0.ebuild
deleted file mode 100644
index 9b77bc83b8e5..000000000000
--- a/dev-cpp/tbb/tbb-2021.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="High level abstract threading library"
-HOMEPAGE="https://github.com/oneapi-src/oneTBB"
-SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oneTBB-${PV}"
-
-LICENSE="Apache-2.0"
-# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
-# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
-SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2021.7.0-pthread-eagain.patch
- "${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
-)
-
-src_prepare() {
- # Has an #error to force compilation as C but links with C++ library, dies
- # with GLIBCXX_ASSERTIONS as a result.
- sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' test/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- # Workaround for bug #912210
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- local mycmakeargs=(
- -DTBB_TEST=$(usex test)
- -DTBB_ENABLE_IPO=OFF
- -DTBB_STRICT=OFF
- )
-
- cmake-multilib_src_configure
-}
diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index 2a0013ba8bb3..40e9314966f1 100644
--- a/dev-cpp/tbb/tbb-2021.9.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
+ "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch
)
src_prepare() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-25 16:41:18 +0000