Accepting request 499650 from devel:libraries:c_c++
1 OBS-URL: https://build.opensuse.org/request/show/499650 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tbb?expand=0&rev=8
This commit is contained in:
commit
7b3bfeed35
17
reproducible.patch
Normal file
17
reproducible.patch
Normal file
@ -0,0 +1,17 @@
|
||||
Index: tbb-2017_U6/build/version_info_linux.sh
|
||||
===================================================================
|
||||
--- tbb-2017_U6.orig/build/version_info_linux.sh
|
||||
+++ tbb-2017_U6/build/version_info_linux.sh
|
||||
@@ -20,10 +20,10 @@
|
||||
|
||||
# Script used to generate version info string
|
||||
echo "#define __TBB_VERSION_STRINGS(N) \\"
|
||||
-echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`uname -m`")"'" ENDL \'
|
||||
+echo '#N": BUILD_HOST'"\t\t"openSUSE" ("`uname -m`")"'" ENDL \'
|
||||
# find OS name in *-release and issue* files by filtering blank lines and lsb-release content out
|
||||
echo '#N": BUILD_OS'"\t\t"`lsb_release -sd 2>/dev/null | grep -ih '[a-z] ' - /etc/*release /etc/issue 2>/dev/null | head -1 | sed -e 's/["\\\\]//g'`'" ENDL \'
|
||||
-echo '#N": BUILD_KERNEL'"\t"`uname -srv`'" ENDL \'
|
||||
+echo '#N": BUILD_KERNEL'"\t"Linux'" ENDL \'
|
||||
echo '#N": BUILD_GCC'"\t\t"`g++ --version </dev/null 2>&1 | grep 'g++'`'" ENDL \'
|
||||
[ -z "$COMPILER_VERSION" ] || echo '#N": BUILD_COMPILER'"\t"$COMPILER_VERSION'" ENDL \'
|
||||
echo '#N": BUILD_LIBC'"\t"`getconf GNU_LIBC_VERSION | grep glibc | sed -e 's/^glibc //'`'" ENDL \'
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 30 09:11:27 UTC 2017 - bwiedemann@suse.com
|
||||
|
||||
- Add reproducible.patch to not add build hostname+kernel to binary
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 24 12:21:12 UTC 2017 - idonmez@suse.com
|
||||
|
||||
|
3
tbb.spec
3
tbb.spec
@ -29,6 +29,8 @@ Url: https://www.threadingbuildingblocks.org/
|
||||
Source0: https://github.com/01org/tbb/archive/%{rel_ver}.tar.gz
|
||||
# PATCH-FIX-OPENSUSE optflags.patch -- Use rpm optflags
|
||||
Patch1: optflags.patch
|
||||
# PATCH-FIX-OPENSUSE reproducible.patch -- Do not compile build hostname+kernel into binary
|
||||
Patch2: reproducible.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: swig >= 3.0.6
|
||||
@ -89,6 +91,7 @@ This package contains the header files needed for development with tbb.
|
||||
%prep
|
||||
%setup -q -n %{name}-%{rel_ver}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
make OPTFLAGS="%{optflags}" %{?_smp_mflags} tbb_build_prefix=obj
|
||||
|
Loading…
x
Reference in New Issue
Block a user