Rebase to 2019 update 9.
This commit is contained in:
parent
64bf7c4d92
commit
d846f5e692
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (tbb-2019_U8.tar.gz) = 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8
|
SHA512 (tbb-2019_U9.tar.gz) = 610757437b5554923c13224ea88819456940731c9ce4e9058c4a2f3e62bd694435189d56641f4b2fc61a0c4c59186a910cb86584fe82cf006d2faa2b2d00585c
|
||||||
|
5
tbb.rpmlintrc
Normal file
5
tbb.rpmlintrc
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON
|
||||||
|
# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors
|
||||||
|
|
||||||
|
# The dictionary lacks some technical words
|
||||||
|
addFilter(r'spelling-error .* symlinks')
|
19
tbb.spec
19
tbb.spec
@ -1,11 +1,11 @@
|
|||||||
%global upver 2019
|
%global upver 2019
|
||||||
%global uprel 8
|
%global uprel 9
|
||||||
%global upfullver %{upver}%{?uprel:_U%{uprel}}
|
%global upfullver %{upver}%{?uprel:_U%{uprel}}
|
||||||
|
|
||||||
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: %{upver}%{?uprel:.%{uprel}}
|
Version: %{upver}%{?uprel:.%{uprel}}
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://threadingbuildingblocks.org/
|
URL: http://threadingbuildingblocks.org/
|
||||||
|
|
||||||
@ -85,7 +85,7 @@ sed -i 's/"`hostname -s`" ("`uname -m`"/fedorabuild (%{_arch}/' \
|
|||||||
# Do not assume the RTM instructions are available.
|
# Do not assume the RTM instructions are available.
|
||||||
# Insert --as-needed before the libraries to be linked.
|
# Insert --as-needed before the libraries to be linked.
|
||||||
sed -e 's/-mrtm//' \
|
sed -e 's/-mrtm//' \
|
||||||
-e "s|LIB_LINK_FLAGS = |&-Wl,--as-needed $RPM_LD_FLAGS |" \
|
-e "s/-fPIC/& -Wl,--as-needed/" \
|
||||||
-i build/linux.gcc.inc
|
-i build/linux.gcc.inc
|
||||||
|
|
||||||
# Invoke the right python binary directly
|
# Invoke the right python binary directly
|
||||||
@ -96,7 +96,8 @@ sed -i '/^#!/d' python/tbb/{pool,test}.py
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} tbb_build_prefix=obj stdver=c++14 \
|
make %{?_smp_mflags} tbb_build_prefix=obj stdver=c++14 \
|
||||||
CXXFLAGS="$RPM_OPT_FLAGS"
|
CXXFLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD" \
|
||||||
|
LDFLAGS="$RPM_LD_FLAGS -lpthread"
|
||||||
for file in %{SOURCE6} %{SOURCE7} %{SOURCE8}; do
|
for file in %{SOURCE6} %{SOURCE7} %{SOURCE8}; do
|
||||||
base=$(basename ${file})
|
base=$(basename ${file})
|
||||||
sed 's/_FEDORA_VERSION/%{version}/' ${file} > ${base}
|
sed 's/_FEDORA_VERSION/%{version}/' ${file} > ${base}
|
||||||
@ -107,9 +108,8 @@ done
|
|||||||
. build/obj_release/tbbvars.sh
|
. build/obj_release/tbbvars.sh
|
||||||
pushd python
|
pushd python
|
||||||
make %{?_smp_mflags} -C rml stdver=c++14 \
|
make %{?_smp_mflags} -C rml stdver=c++14 \
|
||||||
CPLUS_FLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD" \
|
CPLUS_FLAGS="%{optflags} -DDO_ITT_NOTIFY -DUSE_PTHREAD" \
|
||||||
PIC_KEY="-fPIC -Wl,--as-needed" \
|
LDFLAGS="$RPM_LD_FLAGS -lpthread"
|
||||||
LDFLAGS="$RPM_LD_FLAGS"
|
|
||||||
cp -p rml/libirml.so* .
|
cp -p rml/libirml.so* .
|
||||||
%py3_build
|
%py3_build
|
||||||
popd
|
popd
|
||||||
@ -118,7 +118,7 @@ popd
|
|||||||
make doxygen
|
make doxygen
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make test tbb_build_prefix=obj stdver=c++14 CXXFLAGS="$RPM_OPT_FLAGS"
|
make test tbb_build_prefix=obj stdver=c++14 CXXFLAGS="%{optflags}"
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_libdir}
|
mkdir -p $RPM_BUILD_ROOT/%{_libdir}
|
||||||
@ -188,6 +188,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/cmake/%{name}/README.rst
|
|||||||
%{python3_sitearch}/__pycache__/TBB*
|
%{python3_sitearch}/__pycache__/TBB*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Oct 12 2019 Jerry James <loganjerry@gmail.com> - 2019.9-1
|
||||||
|
- Rebase to 2019 update 9
|
||||||
|
|
||||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2019.8-4
|
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2019.8-4
|
||||||
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user