Rebase to 4.4u3.
This commit is contained in:
parent
13acef3541
commit
20ed6fb2cf
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@ tbb*/
|
|||||||
.*.log
|
.*.log
|
||||||
/tbb43_20141204oss_src.tgz
|
/tbb43_20141204oss_src.tgz
|
||||||
/tbb44_20151115oss_src.tgz
|
/tbb44_20151115oss_src.tgz
|
||||||
|
/tbb44_20160128oss_src.tgz
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
7fae6a6bbca68bbdc18e844d6721d5e4 tbb44_20151115oss_src.tgz
|
9d8a4cdf43496f1b3f7c473a5248e5cc tbb44_20160128oss_src.tgz
|
||||||
|
8
tbb-4.4-min.patch
Normal file
8
tbb-4.4-min.patch
Normal file
@ -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
|
30
tbb.spec
30
tbb.spec
@ -1,16 +1,16 @@
|
|||||||
%define releasedate 20151115
|
%global releasedate 20160128
|
||||||
%define major 4
|
%global major 4
|
||||||
%define minor 4
|
%global minor 4
|
||||||
%define update 2
|
%global update 3
|
||||||
%define dotver %{major}.%{minor}
|
%global dotver %{major}.%{minor}
|
||||||
%define sourcebasename tbb%{major}%{minor}_%{releasedate}oss
|
%global sourcebasename tbb%{major}%{minor}_%{releasedate}oss
|
||||||
|
|
||||||
%define sourcefilename %{sourcebasename}_src.tgz
|
%global sourcefilename %{sourcebasename}_src.tgz
|
||||||
|
|
||||||
Name: tbb
|
Name: tbb
|
||||||
Summary: The Threading Building Blocks library abstracts low-level threading details
|
Summary: The Threading Building Blocks library abstracts low-level threading details
|
||||||
Version: %{dotver}
|
Version: %{dotver}
|
||||||
Release: 2.%{releasedate}%{?dist}
|
Release: 3.%{releasedate}%{?dist}
|
||||||
License: GPLv2 with exceptions
|
License: GPLv2 with exceptions
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://threadingbuildingblocks.org/
|
URL: http://threadingbuildingblocks.org/
|
||||||
@ -36,7 +36,10 @@ Patch2: tbb-4.0-mfence.patch
|
|||||||
# Related: https://bugzilla.redhat.com/show_bug.cgi?id=1037347
|
# Related: https://bugzilla.redhat.com/show_bug.cgi?id=1037347
|
||||||
Patch3: tbb-4.3-dont-snip-Wall.patch
|
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
|
%description
|
||||||
Threading Building Blocks (TBB) is a C++ runtime library that
|
Threading Building Blocks (TBB) is a C++ runtime library that
|
||||||
@ -75,9 +78,11 @@ C++ library.
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
# For repeatable builds, don't query the hostname
|
# For repeatable builds, don't query the hostname or architecture
|
||||||
sed -i 's/`hostname -s`/fedorabuild/' build/version_info_linux.sh
|
sed -i 's/`hostname -s`" ("`uname -m`/fedorabuild" ("%{_arch}/' \
|
||||||
|
build/version_info_linux.sh
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch %{ix86}
|
%ifarch %{ix86}
|
||||||
@ -154,6 +159,9 @@ done
|
|||||||
%doc doc/html
|
%doc doc/html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 20 2016 Jerry James <loganjerry@gmail.com> - 4.4-3.20160128
|
||||||
|
- Rebase to 4.4u3
|
||||||
|
|
||||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.4-2.20151115
|
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.4-2.20151115
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user