CVS commit: pkgsrc/parallel/threadingbuildingblocks

["Frederic Cambus" <fcambus%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fcambus
Date:           Thu Jul 29 20:03:28 UTC 2021

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

Log Message:
threadingbuildingblocks: fix build on Linux, we need to link against dl.

Use CMAKE_SYSTEM_NAME to enable linking against dl only on Linux.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/parallel/threadingbuildingblocks/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.

Modified files:

Index: pkgsrc/parallel/threadingbuildingblocks/distinfo
diff -u pkgsrc/parallel/threadingbuildingblocks/distinfo:1.7 pkgsrc/parallel/threadingbuildingblocks/distinfo:1.8
--- pkgsrc/parallel/threadingbuildingblocks/distinfo:1.7        Wed Jul 14 17:56:16 2021
+++ pkgsrc/parallel/threadingbuildingblocks/distinfo    Thu Jul 29 20:03:28 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2021/07/14 17:56:16 adam Exp $
+$NetBSD: distinfo,v 1.8 2021/07/29 20:03:28 fcambus Exp $
 
 SHA1 (oneTBB-2021.3.0.tar.gz) = 4335ea0dc87d1ead91998e90e7de3045704c1fda
 RMD160 (oneTBB-2021.3.0.tar.gz) = f09caab75e92914edfad977d499beb35b87cef48
 SHA512 (oneTBB-2021.3.0.tar.gz) = 969bc8d1dcf50bd12f70633d0319e46308eb1667cdc6f0503b373a35dcb2fe6b2adf59c26bd3c8e2a99a8d2d8b9f64088db5a43e784218b163b3661d12908c0e
 Size (oneTBB-2021.3.0.tar.gz) = 1651329 bytes
-SHA1 (patch-cmake_compilers_Clang.cmake) = 85e2df7336b12839d9a60f374c31835ee86ca7ac
-SHA1 (patch-cmake_compilers_GNU.cmake) = 2673e6f9c0a7f8d99399c6f645b9ce30d9f95d06
+SHA1 (patch-cmake_compilers_Clang.cmake) = e61f17d9df4dd06b2c42a6e450fdc3a452b10516
+SHA1 (patch-cmake_compilers_GNU.cmake) = c52042af12a3f90822a70ba6ec0e943deeb24eb7

Index: pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake
diff -u pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake:1.1 pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake:1.2
--- pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake:1.1       Wed Jul 14 17:56:52 2021
+++ pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_Clang.cmake   Thu Jul 29 20:03:28 2021
@@ -1,14 +1,17 @@
-$NetBSD: patch-cmake_compilers_Clang.cmake,v 1.1 2021/07/14 17:56:52 adam Exp $
+$NetBSD: patch-cmake_compilers_Clang.cmake,v 1.2 2021/07/29 20:03:28 fcambus Exp $
 
-Do not link against dl.
+Only link against dl on Linux.
 
---- cmake/compilers/Clang.cmake.orig   2021-07-14 13:02:23.067505600 +0000
+--- cmake/compilers/Clang.cmake.orig   2021-07-29 16:43:27.979066736 +0000
 +++ cmake/compilers/Clang.cmake
-@@ -42,7 +42,6 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86
+@@ -42,7 +42,9 @@ 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 (CMAKE_SYSTEM_NAME MATCHES "Linux")
++    set(TBB_COMMON_LINK_LIBS dl)
++endif()
  
  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 pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake:1.1 pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake:1.2
--- pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake:1.1 Wed Jul 14 17:56:52 2021
+++ pkgsrc/parallel/threadingbuildingblocks/patches/patch-cmake_compilers_GNU.cmake     Thu Jul 29 20:03:28 2021
@@ -1,14 +1,17 @@
-$NetBSD: patch-cmake_compilers_GNU.cmake,v 1.1 2021/07/14 17:56:52 adam Exp $
+$NetBSD: patch-cmake_compilers_GNU.cmake,v 1.2 2021/07/29 20:03:28 fcambus Exp $
 
-Do not link against dl.
+Only link against dl on Linux.
 
---- cmake/compilers/GNU.cmake.orig     2021-07-14 13:06:07.988667592 +0000
+--- cmake/compilers/GNU.cmake.orig     2021-07-29 16:43:31.799016814 +0000
 +++ cmake/compilers/GNU.cmake
-@@ -37,7 +37,6 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86
+@@ -37,7 +37,9 @@ 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)
++if (CMAKE_SYSTEM_NAME MATCHES "Linux")
++    set(TBB_COMMON_LINK_LIBS dl)
++endif()
  
  # 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)