diff --git a/2018_U2.tar.gz b/2018_U2.tar.gz deleted file mode 100644 index 68f283d..0000000 --- a/2018_U2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78bb9bae474736d213342f01fe1a6d00c6939d5c75b367e2e43e7bf29a6d8eca -size 2905393 diff --git a/2019_U5.tar.gz b/2019_U5.tar.gz new file mode 100644 index 0000000..cc58d26 --- /dev/null +++ b/2019_U5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ea82d74dec50e18075b4982b8d360f8bd2bf2950f38e2db483aef82e0047444 +size 2563877 diff --git a/optflags.patch b/optflags.patch index 8d33ebf..1620f3f 100644 --- a/optflags.patch +++ b/optflags.patch @@ -1,8 +1,8 @@ -Index: tbb44_20160128oss/build/linux.gcc.inc +Index: tbb-2019_U5/build/linux.gcc.inc =================================================================== ---- tbb44_20160128oss.orig/build/linux.gcc.inc -+++ tbb44_20160128oss/build/linux.gcc.inc -@@ -54,7 +54,7 @@ ifneq (,$(shell gcc -dumpversion | egrep +--- tbb-2019_U5.orig/build/linux.gcc.inc ++++ tbb-2019_U5/build/linux.gcc.inc +@@ -69,7 +69,7 @@ ifneq (,$(shell $(CONLY) -dumpversion | endif ifeq ($(cfg), release) diff --git a/tbb.changes b/tbb.changes index 6d23a59..4109934 100644 --- a/tbb.changes +++ b/tbb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 25 07:56:20 UTC 2019 - Ismail Dönmez + +- Update to version 2019_U5 + * Too many changes to list, please see the included CHANGES file. +- Install TBBConfig*.cmake + ------------------------------------------------------------------- Fri Aug 24 04:10:21 UTC 2018 - bwiedemann@suse.com diff --git a/tbb.spec b/tbb.spec index 22d42e1..e69ba46 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,7 +1,7 @@ # # spec file for package tbb # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,28 +12,29 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define rel_ver 2018_U2 +%define rel_ver 2019_U5 %define so_ver 2 %bcond_without python2 %bcond_without python3 Name: tbb -Version: 2018_20171205 +Version: 2019_20190320 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/2018_U2.tar.gz +Source0: https://github.com/01org/tbb/archive/2019_U5.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 Patch2: reproducible.patch # PATCH-FIX-OPENSUSE disable-irml.patch -- Don't try to link to irml Patch3: disable-irml.patch +BuildRequires: cmake BuildRequires: gcc-c++ %if %{with python2} BuildRequires: python2-devel @@ -157,6 +158,14 @@ pushd build/obj_release done 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 -m 0644 TBBConfig.cmake %{buildroot}%{_libdir}/cmake/TBB +install -m 0644 TBBConfigVersion.cmake %{buildroot}%{_libdir}/cmake/TBB + %if %{with python2} pushd python %python2_install @@ -192,9 +201,10 @@ popd %{_libdir}/libtbbmalloc_proxy.so.%{so_ver}* %files devel -%doc CHANGES LICENSE index.html -%doc doc/Release_Notes.txt doc/html/ +%license LICENSE +%doc CHANGES doc/Release_Notes.txt %{_includedir}/tbb/ +%{_libdir}/cmake/TBB %{_libdir}/libtbb.so %{_libdir}/libtbbmalloc.so %{_libdir}/libtbbmalloc_proxy.so