From 3446fcde17a65dd94e56c98900e1d2d8a677dbe70cabc0186d427108b2df63fe Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 21 Apr 2022 11:28:03 +0000
Subject: [PATCH] Accepting request 971108 from home:adamm:branches:devel:tools

- fix build on SLE12

OBS-URL: https://build.opensuse.org/request/show/971108
OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=247
---
 valgrind.changes |  5 +++++
 valgrind.spec    | 11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/valgrind.changes b/valgrind.changes
index ba13775..2324189 100644
--- a/valgrind.changes
+++ b/valgrind.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 20 09:39:21 UTC 2022 - Adam Majer <adam.majer@suse.de>
+
+- fix build on SLE12
+
 -------------------------------------------------------------------
 Wed Apr 13 15:17:54 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/valgrind.spec b/valgrind.spec
index f26539f..6f6b3e0 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -16,6 +16,10 @@
 #
 
 
+%if 0%{?!make_build:1}
+%define make_build make -O %{?_smp_mflags} V=1 VERBOSE=1
+%endif
+
 # during building the major version of glibc is built into the suppression file
 %define glibc_main_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f1)
 %define glibc_major_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f2)
@@ -50,14 +54,15 @@ ExclusiveArch:  aarch64 %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7l armv7hl ar
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libxslt
 %endif
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1500
 BuildRequires:  gcc8-c++
+%global cpp_version -8
 %else
 BuildRequires:  gcc-c++
 %endif
 %ifarch x86_64 ppc64
 BuildRequires:  glibc-devel-32bit
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1500
 BuildRequires:  gcc8-c++-32bit
 %else
 BuildRequires:  gcc-c++-32bit
@@ -159,6 +164,8 @@ FLAGS="${FLAGS/-m64/}"
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS"
 export FFLAGS="$FLAGS"
+export CXX="g++%{?cpp_version}"
+export CC="gcc%{?cpp_version}"
 autoreconf -fi
 
 export GDB=%{_bindir}/gdb