pool/tbb
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 708277 from devel:libraries:c_c++

Browse Source 
- Add cmake-remove-include-path.patch to remove setting include
  path since we already install under /usr/include and this fixes
  idiot OpenCV trying to do -isystem $TBB_INCLUDE_DIR

- Update to version 2019_U8
  * Fixed a bug in TBB 2019 Update 7 that could lead to incorrect memory
    reallocation on Linux (https://github.com/intel/tbb/issues/148).
  * Fixed enqueuing tbb::task into tbb::task_arena not to fail on threads
    with no task scheduler initialized
    (https://github.com/intel/tbb/issues/116).

- Update to version 2019_U7
  * Added TBBMALLOC_SET_HUGE_SIZE_THRESHOLD parameter to set the
    lower bound for allocations that are not released back to OS
    unless a cleanup is explicitly requested.
  * Added zip_iterator::base() method to get the tuple of underlying
    iterators.
  * Improved async_node to never block a thread that sends a message
    through its gateway.
  * Extended decrement port of the tbb::flow::limiter_node to accept
    messages of integral types.
  * Removed the number_of_decrement_predecessors parameter from the
    constructor of flow::limiter_node. To allow its usage, set
    TBB_DEPRECATED_LIMITER_NODE_CONSTRUCTOR macro to 1.
  * Added ordered associative containers:
    concurrent_{map,multimap,set,multiset} (requires C++11).

OBS-URL: https://build.opensuse.org/request/show/708277
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tbb?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2019-06-13 20:29:26 +00:00 committed by Git OBS Bridge
commit eb4b2a1b66
8 changed files with 92 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
2019_U6.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ba197b3964fce8a84429dd15b75eba7434cb89afc54f86d5ee6f726fdbe97fd
size 2553257

3
2019_U8.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b1fd8caea14be72ae4175896510bf99c809cd7031306a1917565e6de7382fba
size 2580540

26
cmake-remove-include-path.patch Normal file
View File

@ -0,0 +1,26 @@
Index: tbb-2019_U8/cmake/templates/TBBConfig.cmake.in
===================================================================
--- tbb-2019_U8.orig/cmake/templates/TBBConfig.cmake.in
+++ tbb-2019_U8/cmake/templates/TBBConfig.cmake.in
@@ -60,8 +60,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)
- set_target_properties(TBB::${_tbb_component} PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/@TBB_INC_REL_PATH@")
if (EXISTS "${_tbb_release_lib}")
set_target_properties(TBB::${_tbb_component} PROPERTIES
Index: tbb-2019_U8/cmake/templates/TBBConfigInternal.cmake.in
===================================================================
--- tbb-2019_U8.orig/cmake/templates/TBBConfigInternal.cmake.in
+++ tbb-2019_U8/cmake/templates/TBBConfigInternal.cmake.in
@@ -43,8 +43,6 @@ foreach (_tbb_component ${TBB_FIND_COMPO
if (EXISTS "${_tbb_release_lib}" OR EXISTS "${_tbb_debug_lib}")
add_library(TBB::${_tbb_component} SHARED IMPORTED)
- set_target_properties(TBB::${_tbb_component} PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${_tbb_root}/include"@TBB_COMPILE_DEFINITIONS@)
if (EXISTS "${_tbb_release_lib}")
set_target_properties(TBB::${_tbb_component} PROPERTIES

8
disable-irml.patch
View File

@ -1,8 +1,8 @@
Index: tbb-2018_U2/python/setup.py
Index: tbb-2019_U8/python/setup.py
===================================================================
--- tbb-2018_U2.orig/python/setup.py
+++ tbb-2018_U2/python/setup.py
@@ -71,7 +71,7 @@ _tbb = Extension("tbb._api", ["tbb/api.i
--- tbb-2019_U8.orig/python/setup.py
+++ tbb-2019_U8/python/setup.py
@@ -67,7 +67,7 @@ _tbb = Extension("tbb._api", ["tbb/api.i
extra_compile_args=compile_flags + tbb_flag,
extra_link_args=tbb_flag,
libraries =(['tbb'] if not use_compiler_tbb else []) +

8
optflags.patch
View File

@ -1,8 +1,8 @@
Index: tbb-2019_U5/build/linux.gcc.inc
Index: tbb-2019_U8/build/linux.gcc.inc
===================================================================
--- tbb-2019_U5.orig/build/linux.gcc.inc
+++ tbb-2019_U5/build/linux.gcc.inc
@@ -69,7 +69,7 @@ ifneq (,$(shell $(CONLY) -dumpversion |
--- tbb-2019_U8.orig/build/linux.gcc.inc
+++ tbb-2019_U8/build/linux.gcc.inc
@@ -65,7 +65,7 @@ ifneq (,$(shell $(CONLY) -dumpfullversio
endif
ifeq ($(cfg), release)

20
reproducible.patch
View File

@ -1,8 +1,8 @@
Index: tbb-2018_U2/build/version_info_linux.sh
Index: tbb-2019_U8/build/version_info_linux.sh
===================================================================
--- tbb-2018_U2.orig/build/version_info_linux.sh
+++ tbb-2018_U2/build/version_info_linux.sh
@@ -20,10 +20,10 @@
--- tbb-2019_U8.orig/build/version_info_linux.sh
+++ tbb-2019_U8/build/version_info_linux.sh
@@ -16,10 +16,10 @@
# Script used to generate version info string
echo "#define __TBB_VERSION_STRINGS(N) \\"
@ -15,19 +15,19 @@ Index: tbb-2018_U2/build/version_info_linux.sh
echo '#N": BUILD_GCC'"\t\t"`g++ --version </dev/null 2>&1 | grep 'g++'`'" ENDL \'
[ -z "$COMPILER_VERSION" ] || echo '#N": BUILD_COMPILER'"\t"$COMPILER_VERSION'" ENDL \'
echo '#N": BUILD_LIBC'"\t"`getconf GNU_LIBC_VERSION | grep glibc | sed -e 's/^glibc //'`'" ENDL \'
@@ -31,4 +31,4 @@ echo '#N": BUILD_LD'"\t\t"`ld -v 2>&1 |
@@ -27,4 +27,4 @@ echo '#N": BUILD_LD'"\t\t"`ld -v 2>&1 |
echo '#N": BUILD_TARGET'"\t$arch on $runtime"'" ENDL \'
echo '#N": BUILD_COMMAND'"\t"$*'" ENDL \'
echo ""
-echo "#define __TBB_DATETIME \""`date -u`"\""
+echo "#define __TBB_DATETIME \""`date -u -r $(dirname $0)/../CHANGES`"\""
Index: tbb-2018_U2/build/linux.inc
Index: tbb-2019_U8/build/linux.inc
===================================================================
--- tbb-2018_U2.orig/build/linux.inc
+++ tbb-2018_U2/build/linux.inc
@@ -61,7 +61,7 @@ endif
--- tbb-2019_U8.orig/build/linux.inc
+++ tbb-2019_U8/build/linux.inc
@@ -57,7 +57,7 @@ endif
ifndef runtime
export gcc_version:=$(shell gcc -dumpversion)
export gcc_version:=$(shell gcc -dumpfullversion -dumpversion)
os_version:=$(shell uname -r)
- os_kernel_version:=$(shell uname -r | sed -e 's/-.*$$//')
+ os_kernel_version:=4.0

36
tbb.changes
View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri Jun 7 10:44:30 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
- Add cmake-remove-include-path.patch to remove setting include
path since we already install under /usr/include and this fixes
idiot OpenCV trying to do -isystem $TBB_INCLUDE_DIR
-------------------------------------------------------------------
Thu Jun 6 12:22:31 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
- Update to version 2019_U8
* Fixed a bug in TBB 2019 Update 7 that could lead to incorrect memory
reallocation on Linux (https://github.com/intel/tbb/issues/148).
* Fixed enqueuing tbb::task into tbb::task_arena not to fail on threads
with no task scheduler initialized
(https://github.com/intel/tbb/issues/116).
-------------------------------------------------------------------
Tue Jun 4 14:54:09 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
- Update to version 2019_U7
* Added TBBMALLOC_SET_HUGE_SIZE_THRESHOLD parameter to set the
lower bound for allocations that are not released back to OS
unless a cleanup is explicitly requested.
* Added zip_iterator::base() method to get the tuple of underlying
iterators.
* Improved async_node to never block a thread that sends a message
through its gateway.
* Extended decrement port of the tbb::flow::limiter_node to accept
messages of integral types.
* Removed the number_of_decrement_predecessors parameter from the
constructor of flow::limiter_node. To allow its usage, set
TBB_DEPRECATED_LIMITER_NODE_CONSTRUCTOR macro to 1.
* Added ordered associative containers:
concurrent_{map,multimap,set,multiset} (requires C++11).
-------------------------------------------------------------------
Tue May 14 07:53:56 UTC 2019 - Ismail Dönmez <idonmez@suse.com>

19
tbb.spec
View File

@ -16,14 +16,14 @@
#
%define rel_ver 2019_U6
%define rel_ver 2019_U8
%define so_ver 2
%bcond_with python2
%bcond_without python3
Name: tbb
Version: 2019_20190410
Version: 2019_20190605
Release: 0
Summary: Threading Building Blocks (TBB)
License: Apache-2.0
@ -36,6 +36,7 @@ Patch1: optflags.patch
Patch2: reproducible.patch
# PATCH-FIX-OPENSUSE disable-irml.patch -- Don't try to link to irml
Patch3: disable-irml.patch
Patch4: cmake-remove-include-path.patch
BuildRequires: cmake
BuildRequires: gcc-c++
%if %{with python2}
@ -116,9 +117,7 @@ This package contains the header files needed for development with tbb.
%prep
%setup -q -n %{name}-%{rel_ver}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%autopatch -p1
%build
make OPTFLAGS="%{optflags}" %{?_smp_mflags} tbb_build_prefix=obj
@ -162,11 +161,11 @@ popd
mkdir -p %{buildroot}%{_libdir}/cmake/TBB
# Build cmake config files
cmake -DTBB_ROOT=. -DTBB_OS=Linux -DSAVE_TO=. -P cmake/tbb_config_generator.cmake
# Fix library path
sed -i s,"get_filename_component(_tbb_lib_path.*","get_filename_component(_tbb_lib_path %{_libdir} ABSOLUTE)", TBBConfig.cmake
install -pm 0644 TBBConfig.cmake %{buildroot}%{_libdir}/cmake/TBB
install -pm 0644 TBBConfigVersion.cmake %{buildroot}%{_libdir}/cmake/TBB
cmake -DINSTALL_DIR=%{buildroot}%{_libdir}/cmake/TBB \
-DSYSTEM_NAME=Linux \
-DTBB_VERSION_FILE=%{buildroot}%{_includedir}/tbb/tbb_stddef.h \
-DLIB_REL_PATH="../../" \
-P cmake/tbb_config_installer.cmake
%if %{with python2}
pushd python