[pkgsrc/trunk]: pkgsrc/parallel/threadingbuildingblocks/patches threadingbuil...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f977585941d3
branches:  trunk
changeset: 455923:f977585941d3
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jul 14 17:56:52 2021 +0000

description:
threadingbuildingblocks: ... and patches

diffstat:

 parallel/threadingbuildingblocks/patches/patch-build-BSD.inc               |  19 ----------
 parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake |  14 +++++++
 parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake   |  14 +++++++
 3 files changed, 28 insertions(+), 19 deletions(-)

diffs (59 lines):

diff -r 99b41d701399 -r f977585941d3 parallel/threadingbuildingblocks/patches/patch-build-BSD.inc
--- a/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc      Wed Jul 14 17:56:16 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-build-BSD.inc,v 1.2 2021/04/25 07:51:26 mrg Exp $
-
-Support arm64.
-
---- build/BSD.inc.orig 2020-07-10 06:18:01.000000000 -0700
-+++ build/BSD.inc      2021-04-02 00:55:40.143683568 -0700
-@@ -22,6 +22,12 @@
-         ifeq ($(shell uname -m),amd64)
-                 export arch:=intel64
-         endif
-+        ifeq ($(shell uname -p),aarch64)
-+                export arch:=arm64
-+        endif
-+        ifeq ($(shell uname -p),aarch64eb)
-+                export arch:=arm64
-+        endif
- endif
- 
- ifndef runtime
diff -r 99b41d701399 -r f977585941d3 parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake        Wed Jul 14 17:56:52 2021 +0000
@@ -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>)
diff -r 99b41d701399 -r f977585941d3 parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake  Wed Jul 14 17:56:52 2021 +0000
@@ -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)