From 23b9802bd77ca3499355690e907365aabd5a01ca459ab6d0ff29c9072f1af04c Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Tue, 30 May 2017 10:07:37 +0000
Subject: [PATCH] Accepting request 499630 from
 home:bmwiedemann:branches:devel:libraries:c_c++

Add reproducible.patch to not add build hostname+kernel to binary

OBS-URL: https://build.opensuse.org/request/show/499630
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tbb?expand=0&rev=31
---
 reproducible.patch | 17 +++++++++++++++++
 tbb.changes        |  5 +++++
 tbb.spec           |  3 +++
 3 files changed, 25 insertions(+)
 create mode 100644 reproducible.patch

diff --git a/reproducible.patch b/reproducible.patch
new file mode 100644
index 0000000..6c14067
--- /dev/null
+++ b/reproducible.patch
@@ -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 \'
diff --git a/tbb.changes b/tbb.changes
index 2a65750..83a7f20 100644
--- a/tbb.changes
+++ b/tbb.changes
@@ -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
 
diff --git a/tbb.spec b/tbb.spec
index 30f4b1d..1f36658 100644
--- a/tbb.spec
+++ b/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