commit: 73b28fdda13352020f5b403340f3e4640bcca206 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Nov 5 15:30:19 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 5 15:30:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73b28fdd
dev-cpp/tbb: add 2022.3.0, drop 2022.2.0 Don't force -fcf-protection=* or other flag we already set in the toolchain where appropriate. Closes: https://bugs.gentoo.org/965340 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/tbb/Manifest | 2 +- .../files/tbb-2022.3.0-no-clobber-hardened.patch | 37 ++++++++++++++++++++++ .../{tbb-2022.2.0.ebuild => tbb-2022.3.0.ebuild} | 1 + 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index 93b7a39928fe..0114a8393263 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -5,4 +5,4 @@ DIST tbb-2021.7.0.tar.gz 2571727 BLAKE2B 2977ef1a33d9bc7baa40e0e57c02e62798a09c6 DIST tbb-2021.9.0.tar.gz 2579150 BLAKE2B f6f701df1605913770222689063ff422416f86f132fb3fbc80f383b7c52762d3804e75200ca4826906b16c66f674918bcfd78b16a1dafb499ca53a9d2b6652ec SHA512 2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c DIST tbb-2022.0.0.tar.gz 2654343 BLAKE2B eac1a8065e401f1329527ccb1db0a8d30eb54ca2d9180560cd3be2263a779d250a0bda4fc3fb11fede3c63e964490420f09d664a7e39071d9b6a6cf743349f8f SHA512 c87b84964b2c323f61895a532968dfa6413a774c177cffbf6e798a07e74e8da5d449144875771df0a1b02657eeb2a7ae4d41c6c432dbf7ea50e3d5a9ea9f8cd3 DIST tbb-2022.1.0.tar.gz 3434602 BLAKE2B a6441be4830ac79d648eee37a534bb74e2298612237059e2d22778c3aebda7e9a73c58948c8f9e89603cb05270d63d412b28bdc13a7cc6b3f6683ed21f1c221a SHA512 7582748f7d0e0ab46ea6ee7771dfaf7fc08ca7ab7f274fb3373eae0e3411aaafbac192ece15008d9a3d9e8566f8737f96f3f4b5ccf11449ac089d5cd9ebb9eab -DIST tbb-2022.2.0.tar.gz 4244148 BLAKE2B 91a6265574e2f540f5bda31a90bbc376d10788020021acfcc85e614fdcceeb6b3a2b45e745e9797db260141b81035e4ac4ca3dcd49539ac5c0446dac18f988cb SHA512 d87c67514ca17c9769910194a8fac912e183952ad5c408dbceb48edc8aef13375df3d4c9120a7366206c8ab72699ed953df65c11c261e19d8e9d273c73d073f3 +DIST tbb-2022.3.0.tar.gz 6836514 BLAKE2B 466e599dca7a64608eaa4df2fe16e62261230446a961bfadc65b9cded9489ed0b5a1e2d9d2a9dd3d202b62ac32e10c2cfa9b1a3cf1e292347985ec7b0400a72f SHA512 fdc50589785b1949ca1dd4429bbcedb180be4b8966da5243ddd1f8e9f97310dd603681e0bb83c1d6c2d3e27932f577ef6739e4e82f3c54af147f4d6d906b39f1 diff --git a/dev-cpp/tbb/files/tbb-2022.3.0-no-clobber-hardened.patch b/dev-cpp/tbb/files/tbb-2022.3.0-no-clobber-hardened.patch new file mode 100644 index 000000000000..ac8b3d756a0f --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2022.3.0-no-clobber-hardened.patch @@ -0,0 +1,37 @@ +We already set these flags as appropriate in the toolchain. +--- a/cmake/compilers/Clang.cmake ++++ b/cmake/compilers/Clang.cmake +@@ -63,15 +63,11 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN) + endif() + + # Clang flags to prevent compiler from optimizing out security checks +-set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security -fPIC $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:-fstack-protector-strong>) +- +-if (NOT APPLE AND NOT ANDROID_PLATFORM AND CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)") +- set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} -fstack-clash-protection $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:-fcf-protection=full>) +-endif() ++set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security -fPIC) + + # -z switch is not supported on MacOS + if (NOT APPLE) +- set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack) ++ set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,noexecstack) + endif() + + set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS}) +--- a/cmake/compilers/GNU.cmake ++++ b/cmake/compilers/GNU.cmake +@@ -121,12 +121,7 @@ endif () + + # Gnu flags to prevent compiler from optimizing out security checks + set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv) +-set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security +- -fstack-protector-strong ) +-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN) +- set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},8.0>>:-fcf-protection=full>) +-endif () +-set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},8.0>>:-fstack-clash-protection>) ++set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security) + + # -z switch is not supported on MacOS and MinGW + if (NOT APPLE AND NOT MINGW) diff --git a/dev-cpp/tbb/tbb-2022.2.0.ebuild b/dev-cpp/tbb/tbb-2022.3.0.ebuild similarity index 96% rename from dev-cpp/tbb/tbb-2022.2.0.ebuild rename to dev-cpp/tbb/tbb-2022.3.0.ebuild index edfcdf42ad9a..e1263b783771 100644 --- a/dev-cpp/tbb/tbb-2022.2.0.ebuild +++ b/dev-cpp/tbb/tbb-2022.3.0.ebuild @@ -25,6 +25,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch "${FILESDIR}"/${PN}-2022.0.0_do-not-fortify-source.patch + "${FILESDIR}"/${PN}-2022.3.0-no-clobber-hardened.patch ) src_prepare() {
