CVS commit: pkgsrc/parallel/threadingbuildingblocks

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jun 20 14:20:32 UTC 2025

Modified Files:
        pkgsrc/parallel/threadingbuildingblocks: distinfo
Added Files:
        pkgsrc/parallel/threadingbuildingblocks/patches:
            patch-cmake_compilers_Clang.cmake patch-cmake_compilers_GNU.cmake

Log Message:
threadbuildingblocks: Portability fixes.

Do not assume that these hardening flags are supported by the
target platform.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/parallel/threadingbuildingblocks/distinfo
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake
cvs rdiff -u -r0 -r1.6 \
    pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/threadingbuildingblocks/distinfo
diff -u pkgsrc/parallel/threadingbuildingblocks/distinfo:1.15 pkgsrc/parallel/threadingbuildingblocks/distinfo:1.16
--- pkgsrc/parallel/threadingbuildingblocks/distinfo:1.15       Wed Nov 13 08:58:55 2024
+++ pkgsrc/parallel/threadingbuildingblocks/distinfo    Fri Jun 20 14:20:32 2025
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.15 2024/11/13 08:58:55 nros Exp $
+$NetBSD: distinfo,v 1.16 2025/06/20 14:20:32 nia Exp $
 
 BLAKE2s (oneTBB-2022.0.0.tar.gz) = 9019a4d91edd8f52994f3f2e72484dd6919fa6d73eb442603eb897f0c7ca8705
 SHA512 (oneTBB-2022.0.0.tar.gz) = c87b84964b2c323f61895a532968dfa6413a774c177cffbf6e798a07e74e8da5d449144875771df0a1b02657eeb2a7ae4d41c6c432dbf7ea50e3d5a9ea9f8cd3
 Size (oneTBB-2022.0.0.tar.gz) = 2654343 bytes
+SHA1 (patch-cmake_compilers_Clang.cmake) = 44641ddc7f4e5880033fa120a6d1bfcbb6cd43a7
+SHA1 (patch-cmake_compilers_GNU.cmake) = 38ce1505c3d7c77f116b6021908b17bed368ffa4
 SHA1 (patch-test_tbb_test__composite__node.cpp) = 1c48644e8cbee6622e2cf4a91901db217cee2ff3
 SHA1 (patch-test_tbb_test__eh__thread.cpp) = 50c2bbcbdf00cb3ef5fe206a952d30672a5e73c6

Added files:

Index: pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake
diff -u /dev/null pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake:1.4
--- /dev/null   Fri Jun 20 14:20:32 2025
+++ pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake   Fri Jun 20 14:20:32 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-cmake_compilers_Clang.cmake,v 1.4 2025/06/20 14:20:32 nia Exp $
+
+Remove security hardening flags so that the mk/ infrastructure can pass
+them depending on whether they are supported by the target platform.
+
+--- cmake/compilers/Clang.cmake.orig   2025-06-20 14:04:56.076853522 +0000
++++ cmake/compilers/Clang.cmake
+@@ -65,11 +65,6 @@ 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>)
+ 
+-# -z switch is not supported on MacOS
+-if (NOT APPLE)
+-    set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now)
+-endif()
+-
+ set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS})
+ 
+ if (NOT CMAKE_CXX_FLAGS MATCHES "_FORTIFY_SOURCE")

Index: pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake
diff -u /dev/null pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake:1.6
--- /dev/null   Fri Jun 20 14:20:32 2025
+++ pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake     Fri Jun 20 14:20:32 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-cmake_compilers_GNU.cmake,v 1.6 2025/06/20 14:20:32 nia Exp $
+
+Remove security hardening flags so that the mk/ infrastructure can pass
+them depending on whether they are supported by the target platform.
+
+--- cmake/compilers/GNU.cmake.orig     2025-06-20 14:05:05.891314120 +0000
++++ cmake/compilers/GNU.cmake
+@@ -103,15 +103,6 @@ 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 )
+-# -z switch is not supported on MacOS and MinGW
+-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 ()
+ 
+ # TBB malloc settings
+ set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions)