From 771c92ddafa9f031ce541e3e486e51d649e0e88dc11be7da3335d760bf6ab297 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 12 Apr 2022 14:17:35 +0000 Subject: [PATCH] Accepting request 969432 from home:frispete:3dprinting - Use gcc version 10 for anything but Tumbleweed OBS-URL: https://build.opensuse.org/request/show/969432 OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=36 --- PrusaSlicer.changes | 5 +++++ PrusaSlicer.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index 23e26fb..888ab73 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 12 12:59:51 UTC 2022 - Hans-Peter Jansen + +- Use gcc version 10 for anything but Tumbleweed + ------------------------------------------------------------------- Tue Apr 12 06:41:47 UTC 2022 - Adrian Schröter diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index dacd9b6..0fd6371 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -32,7 +32,11 @@ BuildRequires: eigen3-devel >= 3 BuildRequires: expat BuildRequires: fdupes # gcc v8 is required as least for charconv header. version 10 exists on 15.4 and tumbleweed +%if 0%{?suse_version} >= 1550 +%define gcc_ver %{gcc_version} +%else %define gcc_ver 10 +%endif BuildRequires: gcc%gcc_ver-c++ # For now, use bundled GLEW because of gh#prusa3d/PrusaSlicer#6396 #!BuildIgnore: glew-devel