Rebase to 2017 update 3. Drop upstreamed s390x patch.

This commit is contained in:
Jerry James 2016-12-02 10:40:56 -07:00
parent 77b1d5f702
commit 66182fb1f6
3 changed files with 7 additions and 22 deletions

View File

@ -1 +1 @@
ffa0ae5e69d3b81ee4680cb9f526056a tbb2017_20161004oss_src.tgz
bd71c82574927ce5507abcbcd3be2c1c tbb2017_20161128oss_src.tgz

View File

@ -1,13 +0,0 @@
diff -up tbb2017_20160916oss/build/linux.inc.s390x tbb2017_20160916oss/build/linux.inc
--- tbb2017_20160916oss/build/linux.inc.s390x 2016-10-07 13:54:30.422343446 +0200
+++ tbb2017_20160916oss/build/linux.inc 2016-10-07 13:54:53.002343446 +0200
@@ -102,6 +102,9 @@ endif
ifeq ($(arch),sparc)
def_prefix = lin64
endif
+ifeq ($(arch),s390x)
+ def_prefix = lin64
+endif
ifeq ($(arch),armv7)
def_prefix = lin32
endif

View File

@ -1,4 +1,4 @@
%global releasedate 20161004
%global releasedate 20161128
%if 0%{?fedora} || 0%{?rhel} >= 8
%global with_python3 1
@ -7,7 +7,7 @@
Name: tbb
Summary: The Threading Building Blocks library abstracts low-level threading details
Version: 2017
Release: 4.%{releasedate}%{?dist}
Release: 5.%{releasedate}%{?dist}
License: ASL 2.0
Group: Development/Tools
URL: http://threadingbuildingblocks.org/
@ -35,11 +35,6 @@ Patch2: tbb-4.0-mfence.patch
# Related: https://bugzilla.redhat.com/show_bug.cgi?id=1037347
Patch3: tbb-4.3-dont-snip-Wall.patch
# Fix detection of s390x as 64-bit arch, it affects the version script used
# for symbols in the public library
# Related: https://bugzilla.redhat.com/show_bug.cgi?id=1379632
Patch4: tbb-2017-64bit.patch
BuildRequires: gcc-c++
BuildRequires: python2-devel
BuildRequires: swig
@ -103,7 +98,6 @@ Python 3 TBB module.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# For repeatable builds, don't query the hostname or architecture
sed -i 's/`hostname -s`" ("`uname -m`/fedorabuild" ("%{_arch}/' \
@ -228,6 +222,10 @@ popd
%endif
%changelog
* Fri Dec 2 2016 Jerry James <loganjerry@gmail.com> - 2017-5.20161128
- Rebase to 2017 update 3
- Drop upstreamed s390x patch
* Wed Nov 2 2016 Jerry James <loganjerry@gmail.com> - 2017-4.20161004
- Rebase to 2017 update 2