From d2bcdab82e5f5f38a8ab54026e8aa94edb1b77a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Dec 2024 06:30:52 +0000 Subject: gentoo auto-resync : 21:12:2024 - 06:30:51 --- dev-cpp/tbb/Manifest | 2 +- dev-cpp/tbb/tbb-2022.0.0-r1.ebuild | 51 ++++++++++++++++++++++++++++++++++++++ dev-cpp/tbb/tbb-2022.0.0.ebuild | 51 -------------------------------------- 3 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 dev-cpp/tbb/tbb-2022.0.0-r1.ebuild delete mode 100644 dev-cpp/tbb/tbb-2022.0.0.ebuild (limited to 'dev-cpp/tbb') diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index 81e9504ab7e0..78aff0a2f871 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -15,5 +15,5 @@ EBUILD tbb-2021.12.0.ebuild 1417 BLAKE2B 2af0947eb0bc96fbda1ef7c48731fbd62836d0a 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 -EBUILD tbb-2022.0.0.ebuild 1452 BLAKE2B f0f696a7435726edde1ebfaa1b7c08b00727150ceaa7eb2938dbf31a036c90321ce90f12f2e42ab211126118c2c480e1a662edc3706faa86af7bc2f01342c158 SHA512 64b789db7663638c66746e10e6e301b1ea4e3544aae4b69fcccdb9ef4e5cf7734566488f1ca2bbfc43a5b5c210068de1ffcc2822777fc287cce3551729ec5479 +EBUILD tbb-2022.0.0-r1.ebuild 1483 BLAKE2B f4acb5d8dec3acc8a4c1e535d3937809f758a4db74ea328163003b7d405aa89449e1654f4d696c608ebde70925c546f17da96c9247a93403f4a4c72553bd1c97 SHA512 bb04ff4c77a1ac21dec0d7064b1c0d2e901268347c70ec44a52d76e2811a4b4cdc567968c8494137710fdf9d56e90c14b935d9e0ba8678972333dc8ed507e1e6 MISC metadata.xml 857 BLAKE2B 7764cec8972b71a929671a8dc1a64ecb7f3952bd28ebaf2d1a195bc46b04a52eaa4108598fbabba59e7d2c68e07824048888d2e8950f1c495f09053f3f8f4649 SHA512 5d1f8002f1d3d9e1cc79bd454992cad217b7f552106ea8e932c3c6ac697136642a317f533a5075c4c72e35e2521fab93bd3d9a073470721c992b8c01856e1d1a diff --git a/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild b/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild new file mode 100644 index 000000000000..84afb72b85a1 --- /dev/null +++ b/dev-cpp/tbb/tbb-2022.0.0-r1.ebuild @@ -0,0 +1,51 @@ +# 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/uxlfoundation/oneTBB" +SRC_URI="https://github.com/uxlfoundation/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-libtbbmalloc-libtbbbind +SLOT="0/12.14-2.14-3.14" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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.13.0-test-atomics.patch + "${FILESDIR}"/${PN}-2022.0.0_do-not-fortify-source.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_EXAMPLES=OFF # TODO: add this + -DTBB_ENABLE_IPO=OFF + -DTBB_STRICT=OFF + ) + + cmake-multilib_src_configure +} diff --git a/dev-cpp/tbb/tbb-2022.0.0.ebuild b/dev-cpp/tbb/tbb-2022.0.0.ebuild deleted file mode 100644 index bed10c92ab97..000000000000 --- a/dev-cpp/tbb/tbb-2022.0.0.ebuild +++ /dev/null @@ -1,51 +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/uxlfoundation/oneTBB" -SRC_URI="https://github.com/uxlfoundation/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-libtbbmalloc-libtbbbind -SLOT="0/12.14-2.14-3.14" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="sys-apps/hwloc:=" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch - "${FILESDIR}"/${PN}-2022.0.0_do-not-fortify-source.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_EXAMPLES=OFF # TODO: add this - -DTBB_ENABLE_IPO=OFF - -DTBB_STRICT=OFF - ) - - cmake-multilib_src_configure -} -- cgit v1.2.3