From 835c139d2c9cd67e62f22cb61e501b479017a7d21d0d1f1cfef525f72ad87f1c Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 7 Mar 2024 19:32:48 +0000 Subject: [PATCH] Accepting request 1156019 from home:mlin7442:rebuild_fails_156 fix Leap build OBS-URL: https://build.opensuse.org/request/show/1156019 OBS-URL: https://build.opensuse.org/package/show/graphics/orthanc?expand=0&rev=66 --- orthanc.changes | 5 +++++ orthanc.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/orthanc.changes b/orthanc.changes index fece505..7dd4092 100644 --- a/orthanc.changes +++ b/orthanc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 7 15:13:59 UTC 2024 - Max Lin + +- Build orthanc with gcc13 on Leap 15 + ------------------------------------------------------------------- Fri Feb 2 11:54:18 UTC 2024 - Axel Braun diff --git a/orthanc.spec b/orthanc.spec index 11109b2..a153f1e 100644 --- a/orthanc.spec +++ b/orthanc.spec @@ -45,7 +45,11 @@ BuildRequires: curl-devel BuildRequires: dcmtk BuildRequires: dcmtk-devel BuildRequires: doxygen +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200 +BuildRequires: gcc13-c++ +%else BuildRequires: gcc-c++ +%endif BuildRequires: googletest-devel BuildRequires: help2man BuildRequires: jsoncpp-devel @@ -141,6 +145,10 @@ mkdir -p OrthancServer/ThirdPartyDownloads cp %{S:10} %{S:11} %{S:12} %{S:13} OrthancServer/ThirdPartyDownloads/. %build +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200 +export CC=gcc-13 +export CXX=g++-13 +%endif %cmake ../OrthancServer \ -DSTANDALONE_BUILD:BOOL=ON \ -DSTATIC_BUILD:BOOL=OFF \