From da70b1f86bd552885b91a402c44fe32985331319 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Oct 01 2016 10:23:07 +0000
Subject: 3.12.0-0.3-BETA1 - Clear CFLAGS, CXXFLAGS and LDFLAGS during make check.


---

diff --git a/valgrind.spec b/valgrind.spec
index 3832447..c5a6417 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.12.0
-Release: 0.2.BETA1%{?dist}
+Release: 0.3.BETA1%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -74,6 +74,9 @@ Patch3: valgrind-3.9.0-ldso-supp.patch
 # KDE#369169 ppc64 fails jm_int_isa_2_07 test
 Patch4: valgrind-3.12-beta1-ppc64be.patch
 
+# valgrind svn r15988
+Patch5: valgrind-3.12-beta1-ldflags.patch
+
 %if %{build_multilib}
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -187,6 +190,7 @@ Valgrind User Manual for details.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # We need to use the software collection compiler and binutils if available.
@@ -308,9 +312,9 @@ cat /proc/cpuinfo
 
 # Build the test files with the software collection compiler if available.
 %{?scl:PATH=%{_bindir}${PATH:+:${PATH}}}
-# Make sure no extra CFLAGS leak through, the testsuite sets all flags
-# necessary. See also configure above.
-make %{?_smp_mflags} CFLAGS="" check || :
+# Make sure no extra CFLAGS, CXXFLAGS or LDFLAGS leak through,
+# the testsuite sets all flags necessary. See also configure above.
+make %{?_smp_mflags} CFLAGS="" CXXFLAGS="" LDFLAGS="" check
 
 echo ===============TESTING===================
 # On arm the gdb integration tests hang for unknown reasons.
@@ -380,6 +384,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Fri Sep 30 2016 Mark Wielaard <mjw@redhat.com> - 3.12.0-0.3-BETA1
+- Clear CFLAGS, CXXFLAGS and LDFLAGS during make check.
+
 * Thu Sep 29 2016 Mark Wielaard <mjw@redhat.com> - 3.12.0-0.2-BETA1
 - Add valgrind-3.12-beta1-ppc64be.patch.
 - Enable gdb_server tests again.