Rebase to 2017 update 3. Drop upstreamed s390x patch.
This commit is contained in:
parent
77b1d5f702
commit
66182fb1f6
2
sources
2
sources
@ -1 +1 @@
|
|||||||
ffa0ae5e69d3b81ee4680cb9f526056a tbb2017_20161004oss_src.tgz
|
bd71c82574927ce5507abcbcd3be2c1c tbb2017_20161128oss_src.tgz
|
||||||
|
@ -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
|
|
14
tbb.spec
14
tbb.spec
@ -1,4 +1,4 @@
|
|||||||
%global releasedate 20161004
|
%global releasedate 20161128
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||||
%global with_python3 1
|
%global with_python3 1
|
||||||
@ -7,7 +7,7 @@
|
|||||||
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: 2017
|
Version: 2017
|
||||||
Release: 4.%{releasedate}%{?dist}
|
Release: 5.%{releasedate}%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://threadingbuildingblocks.org/
|
URL: http://threadingbuildingblocks.org/
|
||||||
@ -35,11 +35,6 @@ 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
|
||||||
|
|
||||||
# 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: gcc-c++
|
||||||
BuildRequires: python2-devel
|
BuildRequires: python2-devel
|
||||||
BuildRequires: swig
|
BuildRequires: swig
|
||||||
@ -103,7 +98,6 @@ Python 3 TBB module.
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
|
||||||
|
|
||||||
# For repeatable builds, don't query the hostname or architecture
|
# For repeatable builds, don't query the hostname or architecture
|
||||||
sed -i 's/`hostname -s`" ("`uname -m`/fedorabuild" ("%{_arch}/' \
|
sed -i 's/`hostname -s`" ("`uname -m`/fedorabuild" ("%{_arch}/' \
|
||||||
@ -228,6 +222,10 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Nov 2 2016 Jerry James <loganjerry@gmail.com> - 2017-4.20161004
|
||||||
- Rebase to 2017 update 2
|
- Rebase to 2017 update 2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user