diff options
Diffstat (limited to 'dev-cpp/tbb')
| -rw-r--r-- | dev-cpp/tbb/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/tbb/files/tbb-2020.3-gcc13.patch | 35 | ||||
| -rw-r--r-- | dev-cpp/tbb/tbb-2020.3.ebuild | 7 |
3 files changed, 42 insertions, 3 deletions
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index 6f340fc3c63f..50ffbf2ce095 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -1,4 +1,5 @@ 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 @@ -13,7 +14,7 @@ DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646c 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 3325 BLAKE2B c68012042e6b7dfc11d53e1ca68d2c40b73aca6472b2d0401f35cd95d6424e116235c57c0c1a4c3b062402286f8c8c91a61d07d329a8b3e0bdb505acf5ae51f8 SHA512 2efd92e3bd74d3086691e2961d82706c011a32b541fad9114412cfc982922372f2b0a8c061d67c1095341df115e2595a891ed74b80935277d12c56016e4b55b5 +EBUILD tbb-2020.3.ebuild 3366 BLAKE2B 0d78123bfc428b246dff55225392028507c5c233d95230a92589aaabae034bb15549de8d78eb92372e2d1d050fb1f62a2dc4b6bfa7e5171c5d4f6964c6e76311 SHA512 71852df92b726819f12db2f3ab7bdda0121b9399f6e66d750b79e0e8be66eadee3cfa60fbaac9e7b2d7d66eda43d3a68d271de9f34f2ad4a9ff1ca75c79eb7c5 EBUILD tbb-2021.5.0-r1.ebuild 1425 BLAKE2B 36fa0f1c44b38b04ab7e9b116d672383fbf2ccb3597d2da9144f4590a08052c00577186f35497ac381207406935448241d8875d1552392b57e4b9d5e1f228415 SHA512 83e3277669a7ac2a4a7886d068f4fd5699bcf6251a32bd406e224f9a6bb5a00d0a9dae7b46b59c88b05fd2787eae0e437e2f8cc76be9eebf00621801ed852365 EBUILD tbb-2021.7.0-r1.ebuild 989 BLAKE2B 91b110b6bf39cd9ba07930b6481cff9cc209df6b8a9bfba320924e47c3eaa64d8e0b4c393719af729cb26165dd84ca7545dd880210d854d72ce12f60b26c06c7 SHA512 e1a264a8803fb0de0f8d0b518db669ff6e6a860b2a95df5f2f456b7bd027442dfbfa0f52f2f324c5f6f4391bdc571b30b034e65b4d3a07278d8e4bc659a9c9af EBUILD tbb-2021.7.0.ebuild 1022 BLAKE2B e2ec61ba46aedb4187975b7e4848fac95fb167cdb803254e8b26dff2a367ab6d8c571e60e72b2e39dd49ed43bbf6fc1e1cb5e4f99fc7dfc13e2746c7e3f1877b SHA512 cfc2423728c85ade66c01b7d1dbbc7c6923e244581bc4b612197fb34fd03e544af2e7b597411b710c121e7ca5bfeff9fcd7a3e8d832fb397ce1754b6d8150438 diff --git a/dev-cpp/tbb/files/tbb-2020.3-gcc13.patch b/dev-cpp/tbb/files/tbb-2020.3-gcc13.patch new file mode 100644 index 000000000000..1c0803048ca7 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2020.3-gcc13.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/899746 +https://github.com/oneapi-src/oneTBB/pull/833 + +From c18342ba667d1f33f5e9a773aa86b091a9694b97 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Fri, 20 May 2022 07:50:00 +0100 +Subject: [PATCH] tbb_2020: fix build on gcc-13 + +On gcc-13 build started failing due to 'task' identifier collision as: + + ../../include/tbb/task.h:300:20: error: declaration of 'tbb::task& tbb::internal::task_prefix::task()' changes meaning of 'task' [-fpermissive] + 300 | tbb::task& task() {return *reinterpret_cast<tbb::task*>(this+1);} + | ^~~~ + ../../include/tbb/task.h:252:9: note: used here to mean 'class tbb::task' + 252 | task* next_offloaded; + | ^~~~ + ../../include/tbb/task.h:43:7: note: declared here + 43 | class task; + | ^~~~ + +The change adds explicit qualifier to class name to avoid ambiguity with method name. + +Signed-off-by: Sergei Trofimovich <slyich@gmail.com> +--- a/include/tbb/task.h ++++ b/include/tbb/task.h +@@ -249,7 +249,7 @@ namespace internal { + #if __TBB_TASK_PRIORITY + //! Pointer to the next offloaded lower priority task. + /** Used to maintain a list of offloaded tasks inside the scheduler. **/ +- task* next_offloaded; ++ tbb::task* next_offloaded; + #endif + + #if __TBB_PREVIEW_RESUMABLE_TASKS + diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild index f784dbdaec54..9e6f7e2e6797 100644 --- a/dev-cpp/tbb/tbb-2020.3.ebuild +++ b/dev-cpp/tbb/tbb-2020.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,10 @@ S="${WORKDIR}/oneTBB-${MY_PV}" DOCS=( CHANGES README README.md doc/Release_Notes.txt ) -PATCHES=( "${FILESDIR}"/${PN}-2020.1-makefile-debug.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2020.1-makefile-debug.patch + "${FILESDIR}"/${PN}-2020.3-gcc13.patch +) src_prepare() { default |