From 291fd8a4dc17699344092d0bf58056a631867925e1946410708d4982e35b7901 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 8 Mar 2019 17:32:01 +0000 Subject: [PATCH] - Use gcc7 in SLE_12 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=37 --- dirac.changes | 5 +++++ dirac.spec | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dirac.changes b/dirac.changes index 5112abb..814a151 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 8 17:31:33 UTC 2019 - olaf@aepfle.de + +- Use gcc7 in SLE_12 + ------------------------------------------------------------------- Tue Jul 4 10:27:05 UTC 2017 - tchvatal@suse.com diff --git a/dirac.spec b/dirac.spec index a49bc8e..d0ee4dc 100644 --- a/dirac.spec +++ b/dirac.spec @@ -27,8 +27,12 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. Source1: baselibs.conf Patch0: 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch Patch1: %{name}-%{version}-gcc45.patch -BuildRequires: fdupes +%if 0%{?suse_version} > 1315 BuildRequires: gcc-c++ +%else +BuildRequires: gcc7-c++ +%endif +BuildRequires: fdupes BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(cppunit) @@ -105,6 +109,12 @@ prediction structures, which must otherwise be set by hand. sed -i 's/-Werror//' configure.ac %build +test -x "$(type -p gcc)" && export CC=$_ +test -x "$(type -p g++)" && export CXX=$_ +test -x "$(type -p gcc-7)" && export CC=$_ +test -x "$(type -p g++-7)" && export CXX=$_ +test -x "$(type -p gcc-8)" && export CC=$_ +test -x "$(type -p g++-8)" && export CXX=$_ ACLOCAL="aclocal -I m4" autoreconf -fvi %configure \ --disable-silent-rules \