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
This commit is contained in:
Dirk Mueller 2022-04-21 11:28:03 +00:00 committed by Git OBS Bridge
parent ab716a36bb
commit 3446fcde17
2 changed files with 14 additions and 2 deletions

View File

@ -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>

View File

@ -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