CVS commit: pkgsrc/parallel/threadingbuildingblocks/patches

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jul 14 17:56:52 UTC 2021

Added Files:
        pkgsrc/parallel/threadingbuildingblocks/patches:
            patch-cmake_compilers_Clang.cmake patch-cmake_compilers_GNU.cmake
Removed Files:
        pkgsrc/parallel/threadingbuildingblocks/patches: patch-build-BSD.inc

Log Message:
threadingbuildingblocks: ... and patches


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake \
    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.

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.1
--- /dev/null   Wed Jul 14 17:56:52 2021
+++ pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake   Wed Jul 14 17:56:52 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-cmake_compilers_Clang.cmake,v 1.1 2021/07/14 17:56:52 adam Exp $
+
+Do not link against dl.
+
+--- cmake/compilers/Clang.cmake.orig   2021-07-14 13:02:23.067505600 +0000
++++ cmake/compilers/Clang.cmake
+@@ -42,7 +42,6 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86
+     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
+ endif()
+ 
+-set(TBB_COMMON_LINK_LIBS dl)
+ 
+ if (ANDROID_PLATFORM)
+     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>)
Index: pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake
diff -u /dev/null pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake:1.1
--- /dev/null   Wed Jul 14 17:56:52 2021
+++ pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake     Wed Jul 14 17:56:52 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-cmake_compilers_GNU.cmake,v 1.1 2021/07/14 17:56:52 adam Exp $
+
+Do not link against dl.
+
+--- cmake/compilers/GNU.cmake.orig     2021-07-14 13:06:07.988667592 +0000
++++ cmake/compilers/GNU.cmake
+@@ -37,7 +37,6 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86
+     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
+ endif()
+ 
+-set(TBB_COMMON_LINK_LIBS dl)
+ 
+ # 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)