From b52cdc65e26666377eb775f58b5e9cf73efd45db Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 24 May 2017 13:58:50 +0000
Subject: [PATCH 1/2] Accepting request 497989 from
 home:bmwiedemann:branches:Base:System

Allow to disable do_profiling in builds (related to boo#1040589)

now keeping the tests enabled

OBS-URL: https://build.opensuse.org/request/show/497989
OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=239
---
 bash.changes |  5 +++++
 bash.spec    | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/bash.changes b/bash.changes
index bea30c75..2a400cf7 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 24 12:42:20 UTC 2017 - bwiedemann@suse.com
+
+- Allow to disable do_profiling in builds (related to boo#1040589)
+
 -------------------------------------------------------------------
 Wed Apr 26 16:04:15 UTC 2017 - werner@suse.de
 
diff --git a/bash.spec b/bash.spec
index adefeabe..9fd89daf 100644
--- a/bash.spec
+++ b/bash.spec
@@ -536,7 +536,11 @@ popd
 	--disable-strict-posix-default	\
 	--enable-separate-helpfiles=%{_datadir}/bash/helpfiles \
 	$READLINE
-  make %{?do_profiling:CFLAGS="$CFLAGS %cflags_profile_generate"} \
+  profilecflags=CFLAGS="$CFLAGS"
+%if 0%{?do_profiling}
+  profilecflags=CFLAGS="$CFLAGS %cflags_profile_generate"
+%endif
+  make "$profilecflags" \
 	all printenv recho zecho xcase
   TMPDIR=$(mktemp -d /tmp/bash.XXXXXXXXXX) || exit 1
   > $SCREENLOG
@@ -545,7 +549,11 @@ popd
 	SCREENRC=$SCREENRC SCREENDIR=$SCREENDIR \
 	screen -D -m make TESTSCRIPT=%{SOURCE4} check
   kill -TERM $pid
-  make %{?do_profiling:CFLAGS="$CFLAGS %cflags_profile_feedback -fprofile-correction" clean} all
+%if 0%{?do_profiling}
+  profilecflags=CFLAGS="$CFLAGS %cflags_profile_feedback -fprofile-correction"
+  clean=clean
+%endif
+  make "$profilecflags" $clean all
   make -C examples/loadables/
   make documentation
 

From 0299389492f008cfd11e10a8045d7f4f230e707c Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 26 May 2017 06:34:47 +0000
Subject: [PATCH 2/2] Accepting request 498339 from
 home:bmwiedemann:branches:Base:System

Make build reproducible in spite of profile based optimizations (boo#1040589)

OBS-URL: https://build.opensuse.org/request/show/498339
OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=240
---
 bash.changes | 5 +++++
 bash.spec    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/bash.changes b/bash.changes
index 2a400cf7..e810981b 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 25 17:33:36 UTC 2017 - bwiedemann@suse.com
+
+- Make build reproducible in spite of profile based optimizations (boo#1040589)
+
 -------------------------------------------------------------------
 Wed May 24 12:42:20 UTC 2017 - bwiedemann@suse.com
 
diff --git a/bash.spec b/bash.spec
index 9fd89daf..4f34b5a8 100644
--- a/bash.spec
+++ b/bash.spec
@@ -550,6 +550,7 @@ popd
 	screen -D -m make TESTSCRIPT=%{SOURCE4} check
   kill -TERM $pid
 %if 0%{?do_profiling}
+  rm -f jobs.gcda
   profilecflags=CFLAGS="$CFLAGS %cflags_profile_feedback -fprofile-correction"
   clean=clean
 %endif