clibs/tbb
SHA256
6
0
Fork 1
forked from pool/tbb
Code Pull Requests Activity

- Add cmake-remove-include-path.patch to remove setting include

Browse Source 
path since we already install under /usr/include and this fixes
  idiot OpenCV trying to do -isystem $TBB_INCLUDE_DIR

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tbb?expand=0&rev=57
This commit is contained in:
Ismail Dönmez 2019-06-07 10:46:28 +00:00 committed by Git OBS Bridge
parent 475245188d
commit 686e0f88bd
6 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 []) +

6
optflags.patch
View File

@ -1,7 +1,7 @@
Index: tbb-2019_U7/build/linux.gcc.inc
Index: tbb-2019_U8/build/linux.gcc.inc
===================================================================
--- tbb-2019_U7.orig/build/linux.gcc.inc
+++ tbb-2019_U7/build/linux.gcc.inc
--- tbb-2019_U8.orig/build/linux.gcc.inc
+++ tbb-2019_U8/build/linux.gcc.inc
@@ -65,7 +65,7 @@ ifneq (,$(shell $(CONLY) -dumpfullversio
endif

12
reproducible.patch
View File

@ -1,7 +1,7 @@
Index: tbb-2019_U7/build/version_info_linux.sh
Index: tbb-2019_U8/build/version_info_linux.sh
===================================================================
--- tbb-2019_U7.orig/build/version_info_linux.sh
+++ tbb-2019_U7/build/version_info_linux.sh
--- 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
@ -21,10 +21,10 @@ Index: tbb-2019_U7/build/version_info_linux.sh
echo ""
-echo "#define __TBB_DATETIME \""`date -u`"\""
+echo "#define __TBB_DATETIME \""`date -u -r $(dirname $0)/../CHANGES`"\""
Index: tbb-2019_U7/build/linux.inc
Index: tbb-2019_U8/build/linux.inc
===================================================================
--- tbb-2019_U7.orig/build/linux.inc
+++ tbb-2019_U7/build/linux.inc
--- 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 -dumpfullversion -dumpversion)

7
tbb.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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>

5
tbb.spec
View File

@ -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