From 1f422cf3bff38cc6fcf57f7381242bdb8c8d4f7aafabeca19b60498eca791815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 18 Dec 2019 16:38:17 +0000 Subject: [PATCH] - Update to version 2020.0 * Extended task_arena interface to simplify development of NUMA-aware applications. * Added warning notifications when the deprecated functionality is used. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tbb?expand=0&rev=61 --- 2019_U9.tar.gz | 3 --- cmake-remove-include-path.patch | 25 ++++++++++++++----------- tbb-2020.0.tar.gz | 3 +++ tbb.changes | 9 +++++++++ tbb.spec | 11 +++++------ 5 files changed, 31 insertions(+), 20 deletions(-) delete mode 100644 2019_U9.tar.gz create mode 100644 tbb-2020.0.tar.gz diff --git a/2019_U9.tar.gz b/2019_U9.tar.gz deleted file mode 100644 index 54a9801..0000000 --- a/2019_U9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15652f5328cf00c576f065e5cd3eaf3317422fe82afb67a9bcec0dc065bd2abe -size 2614209 diff --git a/cmake-remove-include-path.patch b/cmake-remove-include-path.patch index 5f03434..bbb10d8 100644 --- a/cmake-remove-include-path.patch +++ b/cmake-remove-include-path.patch @@ -1,21 +1,24 @@ -Index: tbb-2019_U9/cmake/templates/TBBConfig.cmake.in +Index: tbb-2020.0/cmake/templates/TBBConfig.cmake.in =================================================================== ---- tbb-2019_U9.orig/cmake/templates/TBBConfig.cmake.in -+++ tbb-2019_U9/cmake/templates/TBBConfig.cmake.in -@@ -53,8 +53,6 @@ foreach (_tbb_component ${TBB_FIND_COMPO - if (EXISTS "${_tbb_release_lib}" OR EXISTS "${_tbb_debug_lib}") +--- tbb-2020.0.orig/cmake/templates/TBBConfig.cmake.in ++++ tbb-2020.0/cmake/templates/TBBConfig.cmake.in +@@ -57,11 +57,6 @@ foreach (_tbb_component ${TBB_FIND_COMPO if (NOT TARGET TBB::${_tbb_component}) add_library(TBB::${_tbb_component} SHARED IMPORTED) -- set_target_properties(TBB::${_tbb_component} PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/@TBB_INC_REL_PATH@") +- get_filename_component(_tbb_include_dir "${CMAKE_CURRENT_LIST_DIR}/@TBB_INC_REL_PATH@" ABSOLUTE) +- set_target_properties(TBB::${_tbb_component} PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${_tbb_include_dir}") +- unset(_tbb_include_dir) +- if (EXISTS "${_tbb_release_lib}") set_target_properties(TBB::${_tbb_component} PROPERTIES -Index: tbb-2019_U9/cmake/templates/TBBConfigInternal.cmake.in + IMPORTED_LOCATION_RELEASE "${_tbb_release_lib}"@TBB_IMPLIB_RELEASE@) +Index: tbb-2020.0/cmake/templates/TBBConfigInternal.cmake.in =================================================================== ---- tbb-2019_U9.orig/cmake/templates/TBBConfigInternal.cmake.in -+++ tbb-2019_U9/cmake/templates/TBBConfigInternal.cmake.in -@@ -54,8 +54,6 @@ foreach (_tbb_component ${TBB_FIND_COMPO +--- tbb-2020.0.orig/cmake/templates/TBBConfigInternal.cmake.in ++++ tbb-2020.0/cmake/templates/TBBConfigInternal.cmake.in +@@ -57,8 +57,6 @@ foreach (_tbb_component ${TBB_FIND_COMPO if (EXISTS "${_tbb_release_lib}" OR EXISTS "${_tbb_debug_lib}") if (NOT TARGET TBB::${_tbb_component}) add_library(TBB::${_tbb_component} SHARED IMPORTED) diff --git a/tbb-2020.0.tar.gz b/tbb-2020.0.tar.gz new file mode 100644 index 0000000..1ad0f6b --- /dev/null +++ b/tbb-2020.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8eed2377ac62e6ac10af5a8303ce861e4525ffe491a061b48e8fe094fc741ce9 +size 2624531 diff --git a/tbb.changes b/tbb.changes index 27de562..c76e01e 100644 --- a/tbb.changes +++ b/tbb.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Dec 18 16:28:51 UTC 2019 - Ismail Dönmez + +- Update to version 2020.0 + * Extended task_arena interface to simplify development of + NUMA-aware applications. + * Added warning notifications when the deprecated functionality is + used. + ------------------------------------------------------------------- Thu Oct 10 12:45:32 UTC 2019 - Ismail Dönmez diff --git a/tbb.spec b/tbb.spec index 2edc246..c07ec33 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,7 +1,7 @@ # # spec file for package tbb # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,19 @@ # -%define rel_ver 2019_U9 %define so_ver 2 %bcond_with python2 %bcond_without python3 Name: tbb -Version: 2019_20190605 +Version: 2020.0 Release: 0 Summary: Threading Building Blocks (TBB) License: Apache-2.0 Group: Development/Libraries/C and C++ -Url: https://www.threadingbuildingblocks.org/ -Source0: https://github.com/01org/tbb/archive/%{rel_ver}.tar.gz +URL: https://www.threadingbuildingblocks.org/ +Source0: https://github.com/intel/tbb/archive/v%{version}.tar.gz#/tbb-%{version}.tar.gz # PATCH-FIX-OPENSUSE optflags.patch -- Use rpm optflags Patch1: optflags.patch # PATCH-FIX-OPENSUSE reproducible.patch -- Do not compile build hostname+kernel into binary @@ -116,7 +115,7 @@ details and threading mechanism for performance and scalability. This package contains the header files needed for development with tbb. %prep -%setup -q -n %{name}-%{rel_ver} +%setup -q %autopatch -p1 %build