diff --git a/.gitignore b/.gitignore index 2aa94f8..a7442b8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ tbb*/ .*.log /tbb43_20141204oss_src.tgz /tbb44_20151115oss_src.tgz +/tbb44_20160128oss_src.tgz diff --git a/sources b/sources index 76a6e2b..9bb5dae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fae6a6bbca68bbdc18e844d6721d5e4 tbb44_20151115oss_src.tgz +9d8a4cdf43496f1b3f7c473a5248e5cc tbb44_20160128oss_src.tgz diff --git a/tbb-4.4-min.patch b/tbb-4.4-min.patch new file mode 100644 index 0000000..f9a0f49 --- /dev/null +++ b/tbb-4.4-min.patch @@ -0,0 +1,8 @@ +diff -up tbb44_20160128oss/src/tbb/tools_api/ittnotify_static.c~ tbb44_20160128oss/src/tbb/tools_api/ittnotify_static.c +--- tbb44_20160128oss/src/tbb/tools_api/ittnotify_static.c~ 2016-01-28 11:30:11.000000000 -0700 ++++ tbb44_20160128oss/src/tbb/tools_api/ittnotify_static.c 2016-02-20 11:24:34.103412460 -0700 +@@ -1038,3 +1038,4 @@ ITT_EXTERN_C __itt_error_handler_t* _N_( + #pragma warning(pop) + #endif /* ITT_PLATFORM==ITT_PLATFORM_WIN */ + ++#undef min diff --git a/tbb.spec b/tbb.spec index da43deb..5f09e7d 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,16 +1,16 @@ -%define releasedate 20151115 -%define major 4 -%define minor 4 -%define update 2 -%define dotver %{major}.%{minor} -%define sourcebasename tbb%{major}%{minor}_%{releasedate}oss +%global releasedate 20160128 +%global major 4 +%global minor 4 +%global update 3 +%global dotver %{major}.%{minor} +%global sourcebasename tbb%{major}%{minor}_%{releasedate}oss -%define sourcefilename %{sourcebasename}_src.tgz +%global sourcefilename %{sourcebasename}_src.tgz Name: tbb Summary: The Threading Building Blocks library abstracts low-level threading details Version: %{dotver} -Release: 2.%{releasedate}%{?dist} +Release: 3.%{releasedate}%{?dist} License: GPLv2 with exceptions Group: Development/Tools URL: http://threadingbuildingblocks.org/ @@ -36,7 +36,10 @@ Patch2: tbb-4.0-mfence.patch # Related: https://bugzilla.redhat.com/show_bug.cgi?id=1037347 Patch3: tbb-4.3-dont-snip-Wall.patch -BuildRequires: libstdc++-devel +# Upstream: 20 Feb 2016. Fix a min macro that clashes with std::min. +Patch4: tbb-4.4-min.patch + +BuildRequires: gcc-c++ %description Threading Building Blocks (TBB) is a C++ runtime library that @@ -75,9 +78,11 @@ C++ library. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 -# For repeatable builds, don't query the hostname -sed -i 's/`hostname -s`/fedorabuild/' build/version_info_linux.sh +# For repeatable builds, don't query the hostname or architecture +sed -i 's/`hostname -s`" ("`uname -m`/fedorabuild" ("%{_arch}/' \ + build/version_info_linux.sh %build %ifarch %{ix86} @@ -154,6 +159,9 @@ done %doc doc/html %changelog +* Sat Feb 20 2016 Jerry James - 4.4-3.20160128 +- Rebase to 4.4u3 + * Fri Feb 05 2016 Fedora Release Engineering - 4.4-2.20151115 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild