diff options
| author | adam <adam@pkgsrc.org> | 2021-07-14 17:56:52 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2021-07-14 17:56:52 +0000 |
| commit | 8acb8f8cda6fed007c372330a3bae1dfd7575c8b (patch) | |
| tree | eccf96bd621f3eccb23414619fbb1f96c10940e8 /parallel/threadingbuildingblocks | |
| parent | 5fd6d9437bc5c40bc2290196daa094e91d5a2df2 (diff) | |
| download | pkgsrc-8acb8f8cda6fed007c372330a3bae1dfd7575c8b.tar.gz | |
threadingbuildingblocks: ... and patches
Diffstat (limited to 'parallel/threadingbuildingblocks')
3 files changed, 28 insertions, 19 deletions
diff --git a/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc b/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc deleted file mode 100644 index 9990b38a037..00000000000 --- a/parallel/threadingbuildingblocks/patches/patch-build-BSD.inc +++ /dev/null @@ -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 --git a/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake b/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake new file mode 100644 index 00000000000..dd8a04894ff --- /dev/null +++ b/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake @@ -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 --git a/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake b/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake new file mode 100644 index 00000000000..b10426c4f02 --- /dev/null +++ b/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake @@ -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) |