From f36e617389406d00c760ee46ed8c2a038766929d984e6d3a659c43a695ee2cf5 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 16 Apr 2019 14:00:04 +0000 Subject: [PATCH] Accepting request 694804 from home:alois Fixed build on targets where gcc8 is availabl OBS-URL: https://build.opensuse.org/request/show/694804 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/spdlog?expand=0&rev=20 --- spdlog.changes | 5 +++++ spdlog.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/spdlog.changes b/spdlog.changes index ece9c08..c862bb6 100644 --- a/spdlog.changes +++ b/spdlog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 16 13:33:41 UTC 2019 - Luigi Baldoni + +- Fixed build on targets where gcc8 is available + ------------------------------------------------------------------- Mon Feb 18 09:33:36 UTC 2019 - Luigi Baldoni diff --git a/spdlog.spec b/spdlog.spec index cf736c3..4791f8c 100644 --- a/spdlog.spec +++ b/spdlog.spec @@ -26,7 +26,11 @@ URL: https://github.com/gabime/spdlog Source0: https://github.com/gabime/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: benchmark-devel >= 1.4.0 BuildRequires: cmake +%if 0%{?suse_version} > 1500 BuildRequires: gcc-c++ >= 8 +%else +BuildRequires: gcc8-c++ +%endif BuildRequires: pkgconfig BuildRequires: pkgconfig(fmt) @@ -51,6 +55,8 @@ find . -name '.gitignore' -exec rm {} \; sed -i -e "s,\r,," README.md LICENSE %build +export CXX=g++ +test -x "$(type -p g++-8)" && export CXX=g++-8 %cmake -DSPDLOG_FMT_EXTERNAL=ON %make_jobs