gentoo auto-resync : 15:07:2024 - 12:27:33

4 files changed, 90 insertions, 0 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 28eca7f92a99..fec431290b25 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index f41f489c2adf..d9c7ccf9da58 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,5 +1,6 @@
 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.13.0-test-atomics.patch 1391 BLAKE2B 96d18091c1df00c2ae4dbbc341a727559a3137e940a2c90efb8bd218f63b0376451b58ed1c0f5ef8a3711c48c82d7fff83eb07443a92736a6e50d942d8071f5c SHA512 0d155b182ef85437dfa16021b5cee12fa6534318a4890c08cb107826f0ebb327385dd540a094399ce53e91211fed16983a359eeabb01d04dc7d2445cf49c638e
 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,6 +14,7 @@ DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177ab
 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.13.0.tar.gz 2613916 BLAKE2B 0edd2d8a966dba673e50827629491924140a302430f4380e7cd9914f3592eaf6515204c7267649237970a5482cc030f0c29cbddd1476f16caf46989f70041058 SHA512 1f536b98c4eb331c3ba21e4b36362c932d7852b974ea7237b5f7bffb0e996d76f688c7ac534cb56f5866cfdffd5d3f015521b4c2ca21e584503070782ca82a2f
 DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
 DIST tbb-2021.7.0.tar.gz 2571727 BLAKE2B 2977ef1a33d9bc7baa40e0e57c02e62798a09c6c66cdbe369f2702d87fd9877c3d97f8d83f71384028995ea0956f5c5630d4aaf4edbe68538e7c514d3b87085c SHA512 d314e3d88b85c96607a9eda15e3d808bf361eb562a534c59101929236e90c187883e7718e5435b5e7f01f4ee652c9765af95f5f173368b83997e4666b7403a49
 DIST tbb-2021.8.0.tar.gz 2575336 BLAKE2B 2c3a7f0e59d70b17550f805461a15a520c7f1b3a37a41bd51c51f9f5863b50812d2b939351e11e0f4ceb3da8a47e413abe171bcb6bfb71c0fe2f81ed373f65f2 SHA512 72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4
@@ -21,6 +23,7 @@ EBUILD tbb-2020.3.ebuild 3437 BLAKE2B 16b92e3a47f6ff29b92163d589f90fed7cffa31f1e
 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.13.0.ebuild 1423 BLAKE2B 1752a9546d5c9291fc5c3081ebb237be2172cc071143e587dc5a2278143279d756308a9f3f445069da8c6a41d6cab1f124625963fffc0a0e27b0f11df9bf695c SHA512 48ee55cdc0a33d8b7ffa56fe88791d13469fb0a21a75d81410f616dc59013f38bcf34c08d15691ae7973093d9d1f3761568da96b7079ba50f2400589651fa086
 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
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/tbb-2021.13.0.ebuild b/dev-cpp/tbb/tbb-2021.13.0.ebuild
new file mode 100644
index 000000000000..ac958e5973a4
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2021.13.0.ebuild
@@ -0,0 +1,49 @@
+# 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
+	"${FILESDIR}"/${PN}-2021.13.0-test-atomics.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
+}