diff --git a/2019_U6.tar.gz b/2019_U6.tar.gz deleted file mode 100644 index eaefa86..0000000 --- a/2019_U6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ba197b3964fce8a84429dd15b75eba7434cb89afc54f86d5ee6f726fdbe97fd -size 2553257 diff --git a/2019_U7.tar.gz b/2019_U7.tar.gz new file mode 100644 index 0000000..b1267ae --- /dev/null +++ b/2019_U7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4204a93f4c0fd989fb6f79acae74feb02ee39725c93968773d9b6efeb75c7a6a +size 2579237 diff --git a/optflags.patch b/optflags.patch index 1620f3f..5ee23c2 100644 --- a/optflags.patch +++ b/optflags.patch @@ -1,8 +1,8 @@ -Index: tbb-2019_U5/build/linux.gcc.inc +Index: tbb-2019_U7/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_U7.orig/build/linux.gcc.inc ++++ tbb-2019_U7/build/linux.gcc.inc +@@ -65,7 +65,7 @@ ifneq (,$(shell $(CONLY) -dumpfullversio endif ifeq ($(cfg), release) diff --git a/reproducible.patch b/reproducible.patch index ec11b56..7322c24 100644 --- a/reproducible.patch +++ b/reproducible.patch @@ -1,8 +1,8 @@ -Index: tbb-2018_U2/build/version_info_linux.sh +Index: tbb-2019_U7/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_U7.orig/build/version_info_linux.sh ++++ tbb-2019_U7/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 &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_U7/build/linux.inc =================================================================== ---- tbb-2018_U2.orig/build/linux.inc -+++ tbb-2018_U2/build/linux.inc -@@ -61,7 +61,7 @@ endif +--- tbb-2019_U7.orig/build/linux.inc ++++ tbb-2019_U7/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 diff --git a/tbb.changes b/tbb.changes index e5b7fbc..4e6ff55 100644 --- a/tbb.changes +++ b/tbb.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Jun 4 14:54:09 UTC 2019 - Ismail Dönmez + +- 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 diff --git a/tbb.spec b/tbb.spec index 4bf1c51..74ca3bd 100644 --- a/tbb.spec +++ b/tbb.spec @@ -16,14 +16,14 @@ # -%define rel_ver 2019_U6 +%define rel_ver 2019_U7 %define so_ver 2 %bcond_with python2 %bcond_without python3 Name: tbb -Version: 2019_20190410 +Version: 2019_20190522 Release: 0 Summary: Threading Building Blocks (TBB) License: Apache-2.0 @@ -162,11 +162,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