From eb5a24376c86f4345859c0aa66b421b67376f9f2 Mon Sep 17 00:00:00 2001 From: John Lees Date: Wed, 13 Feb 2019 12:10:36 -0500 Subject: [PATCH] Update SpydrPick to v1.1.0 --- .../0001-Add-librt-to-linker-line.patch | 25 -------------- ...e-tbb.cmake-with-policy-for-TBB_ROOT.patch | 33 ------------------- recipes/spydrpick/meta.yaml | 7 ++-- 3 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 recipes/spydrpick/0001-Add-librt-to-linker-line.patch delete mode 100644 recipes/spydrpick/0001-Update-tbb.cmake-with-policy-for-TBB_ROOT.patch diff --git a/recipes/spydrpick/0001-Add-librt-to-linker-line.patch b/recipes/spydrpick/0001-Add-librt-to-linker-line.patch deleted file mode 100644 index b340f01303665..0000000000000 --- a/recipes/spydrpick/0001-Add-librt-to-linker-line.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 315c05dddb3fff0159b862377dec7ad1a4dbd13a Mon Sep 17 00:00:00 2001 -From: John Lees -Date: Mon, 4 Feb 2019 13:21:42 -0500 -Subject: [PATCH] Add librt to linker line - ---- - src/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 90224d5..214b94f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -83,6 +83,8 @@ endif() - - # Add pthreads library if building in UNIX - if( UNIX ) -+ target_link_libraries( SpydrPick rt ) -+ target_link_libraries( aracne rt ) - target_link_libraries( SpydrPick pthread ) - target_link_libraries( aracne pthread ) - endif( UNIX ) --- -2.14.3 (Apple Git-98) - diff --git a/recipes/spydrpick/0001-Update-tbb.cmake-with-policy-for-TBB_ROOT.patch b/recipes/spydrpick/0001-Update-tbb.cmake-with-policy-for-TBB_ROOT.patch deleted file mode 100644 index 9ed3b95d864e6..0000000000000 --- a/recipes/spydrpick/0001-Update-tbb.cmake-with-policy-for-TBB_ROOT.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 83d0b23475cf33aa163c8fca929c4bbde5862f78 Mon Sep 17 00:00:00 2001 -From: John Lees -Date: Sun, 3 Feb 2019 22:42:19 -0500 -Subject: [PATCH] Update tbb.cmake with policy for TBB_ROOT - -This variable is ignored with newer versions of cmake ---- - externals/tbb.cmake | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/externals/tbb.cmake b/externals/tbb.cmake -index 3463fca..27df0ae 100644 ---- a/externals/tbb.cmake -+++ b/externals/tbb.cmake -@@ -2,6 +2,15 @@ - - cmake_minimum_required(VERSION 3.1) - -+# for TBB_ROOT if cmake >= 3.12 -+foreach(policy -+ CMP0074 # CMake 3.12 -+ ) -+ if(POLICY ${policy}) -+ cmake_policy(SET ${policy} NEW) -+ endif() -+endforeach() -+ - #option( ${CMAKE_PROJECT_NAME}_ENABLE_TBB "Find TBB and, if successful, enable use in ${CMAKE_PROJECT_NAME}" true ) - - ############## --- -2.14.3 (Apple Git-98) - diff --git a/recipes/spydrpick/meta.yaml b/recipes/spydrpick/meta.yaml index b967a2a2811f4..5e3bb8e8ee02d 100644 --- a/recipes/spydrpick/meta.yaml +++ b/recipes/spydrpick/meta.yaml @@ -1,5 +1,5 @@ {% set name = "SpydrPick" %} -{% set version = "1.0.0" %} +{% set version = "1.1.0" %} package: name: {{ name|lower}} @@ -7,10 +7,7 @@ package: source: url: https://github.com/santeripuranen/{{ name|lower }}/archive/v{{ version }}.tar.gz - sha256: b8f6e839920173f33eb2aea002d618cdab240db18165782d6c40694d0f30936f - patches: - - 0001-Update-tbb.cmake-with-policy-for-TBB_ROOT.patch - - 0001-Add-librt-to-linker-line.patch + sha256: 9999aba14a5c67c5a9ec06ec26fb1ae161042e0b0c3eb7539f5109af5c784eca build: skip: True # [osx]