diff options
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/Manifest.gz | bin | 16856 -> 16856 bytes | |||
| -rw-r--r-- | dev-cpp/tbb/Manifest | 5 | ||||
| -rw-r--r-- | dev-cpp/tbb/files/tbb-2022.0.0_do-not-fortify-source.patch | 42 | ||||
| -rw-r--r-- | dev-cpp/tbb/metadata.xml | 4 | ||||
| -rw-r--r-- | dev-cpp/tbb/tbb-2022.0.0.ebuild | 51 |
5 files changed, 100 insertions, 2 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz Binary files differindex a9965e60a924..4bf82fe4c406 100644 --- a/dev-cpp/Manifest.gz +++ b/dev-cpp/Manifest.gz diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index 67f6f46cb2a8..81e9504ab7e0 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -3,14 +3,17 @@ AUX tbb-2020.3-gcc13.patch 1384 BLAKE2B 8d4288d8c4597247930949d053bcbc4f6b91f369 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 +AUX tbb-2022.0.0_do-not-fortify-source.patch 1552 BLAKE2B 79de12678e14576c42f57019bbf6c6d360e6e1cf61e68072c8eef7c9ec20e60a70d748a0f367cffdcd409ce1e8528c74484b0b2e9fa60a417652f16f36e5620a SHA512 1cab7ce0bca158f9e5ba43eda52de5028f9e5288ba4f9e96c30f15e8dc80997f40b76d152cc91dadeb8414c11fbdcb37dc519d2a67cb474f24e84cd014901a88 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87 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.7.0.tar.gz 2571727 BLAKE2B 2977ef1a33d9bc7baa40e0e57c02e62798a09c6c66cdbe369f2702d87fd9877c3d97f8d83f71384028995ea0956f5c5630d4aaf4edbe68538e7c514d3b87085c SHA512 d314e3d88b85c96607a9eda15e3d808bf361eb562a534c59101929236e90c187883e7718e5435b5e7f01f4ee652c9765af95f5f173368b83997e4666b7403a49 DIST tbb-2021.9.0.tar.gz 2579150 BLAKE2B f6f701df1605913770222689063ff422416f86f132fb3fbc80f383b7c52762d3804e75200ca4826906b16c66f674918bcfd78b16a1dafb499ca53a9d2b6652ec SHA512 2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c +DIST tbb-2022.0.0.tar.gz 2654343 BLAKE2B eac1a8065e401f1329527ccb1db0a8d30eb54ca2d9180560cd3be2263a779d250a0bda4fc3fb11fede3c63e964490420f09d664a7e39071d9b6a6cf743349f8f SHA512 c87b84964b2c323f61895a532968dfa6413a774c177cffbf6e798a07e74e8da5d449144875771df0a1b02657eeb2a7ae4d41c6c432dbf7ea50e3d5a9ea9f8cd3 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 +EBUILD tbb-2022.0.0.ebuild 1452 BLAKE2B f0f696a7435726edde1ebfaa1b7c08b00727150ceaa7eb2938dbf31a036c90321ce90f12f2e42ab211126118c2c480e1a662edc3706faa86af7bc2f01342c158 SHA512 64b789db7663638c66746e10e6e301b1ea4e3544aae4b69fcccdb9ef4e5cf7734566488f1ca2bbfc43a5b5c210068de1ffcc2822777fc287cce3551729ec5479 +MISC metadata.xml 857 BLAKE2B 7764cec8972b71a929671a8dc1a64ecb7f3952bd28ebaf2d1a195bc46b04a52eaa4108598fbabba59e7d2c68e07824048888d2e8950f1c495f09053f3f8f4649 SHA512 5d1f8002f1d3d9e1cc79bd454992cad217b7f552106ea8e932c3c6ac697136642a317f533a5075c4c72e35e2521fab93bd3d9a073470721c992b8c01856e1d1a diff --git a/dev-cpp/tbb/files/tbb-2022.0.0_do-not-fortify-source.patch b/dev-cpp/tbb/files/tbb-2022.0.0_do-not-fortify-source.patch new file mode 100644 index 000000000000..d88a3a54c383 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2022.0.0_do-not-fortify-source.patch @@ -0,0 +1,42 @@ +From: Filip Kobierski <fkobi@pm.me> + +patching just GCC and Clang as we only support that + +Bug: https://bugs.gentoo.org/922605 +--- + cmake/compilers/Clang.cmake | 4 ---- + cmake/compilers/GNU.cmake | 3 --- + 2 files changed, 7 deletions(-) + +diff --git a/cmake/compilers/Clang.cmake b/cmake/compilers/Clang.cmake +index a0297faa..a5c32d0e 100644 +--- a/cmake/compilers/Clang.cmake ++++ b/cmake/compilers/Clang.cmake +@@ -72,10 +72,6 @@ endif() + + set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS}) + +-if (NOT CMAKE_CXX_FLAGS MATCHES "_FORTIFY_SOURCE") +- set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>) +-endif () +- + if (MINGW) + list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__) + endif() +diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake +index da6b408a..857d0888 100644 +--- a/cmake/compilers/GNU.cmake ++++ b/cmake/compilers/GNU.cmake +@@ -109,9 +109,6 @@ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-secur + if (NOT APPLE AND NOT MINGW) + set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack) + endif() +-if (NOT CMAKE_CXX_FLAGS MATCHES "_FORTIFY_SOURCE") +- set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2> ) +-endif () + + if (TBB_FILE_TRIM AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8) + set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -ffile-prefix-map=${NATIVE_TBB_PROJECT_ROOT_DIR}/= -ffile-prefix-map=${NATIVE_TBB_RELATIVE_BIN_PATH}/=) +-- +2.45.2 + diff --git a/dev-cpp/tbb/metadata.xml b/dev-cpp/tbb/metadata.xml index 7283fc113042..715f27d65282 100644 --- a/dev-cpp/tbb/metadata.xml +++ b/dev-cpp/tbb/metadata.xml @@ -13,6 +13,8 @@ for performance and scalability. </longdescription> <upstream> - <remote-id type="github">oneapi-src/oneTBB</remote-id> + <bugs-to>https://github.com/uxlfoundation/oneTBB/issues</bugs-to> + <doc>https://github.com/uxlfoundation/oneTBB?tab=readme-ov-file#documentation</doc> + <remote-id type="github">uxlfoundation/oneTBB</remote-id> </upstream> </pkgmetadata> diff --git a/dev-cpp/tbb/tbb-2022.0.0.ebuild b/dev-cpp/tbb/tbb-2022.0.0.ebuild new file mode 100644 index 000000000000..bed10c92ab97 --- /dev/null +++ b/dev-cpp/tbb/tbb-2022.0.0.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<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME> +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 +} |