From 7fa82f103b3376a10254a8687de10615aec828a2 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Fri, 28 Nov 2025 09:52:20 +0100
Subject: [PATCH] upgrade to gcc 15

---
 configure/os/CONFIG.Common.RHEL8-x86_64     | 3 ++-
 configure/os/CONFIG.Common.RHEL9-x86_64     | 3 ++-
 configure/os/CONFIG_SITE.Common.linuxCommon | 1 +
 epics-base.spec                             | 6 +++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/configure/os/CONFIG.Common.RHEL8-x86_64 b/configure/os/CONFIG.Common.RHEL8-x86_64
index 7296a31a4..2e8bc2a9e 100644
--- a/configure/os/CONFIG.Common.RHEL8-x86_64
+++ b/configure/os/CONFIG.Common.RHEL8-x86_64
@@ -4,8 +4,9 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 BUILD_CLASS = HOST
 
 TOOLSET_LOCATION = /opt/rh
-TOOLSET = gcc-toolset-12
+TOOLSET = gcc-toolset-15
 STD_CXXFLAGS = -std=c++20
+STD_CFLAGS = -std=c17
 
 # Fix bug in gcc-toolset-11 calling the old assembler
 ifneq ($(filter %-11,$(TOOLSET)),)
diff --git a/configure/os/CONFIG.Common.RHEL9-x86_64 b/configure/os/CONFIG.Common.RHEL9-x86_64
index 7296a31a4..2e8bc2a9e 100644
--- a/configure/os/CONFIG.Common.RHEL9-x86_64
+++ b/configure/os/CONFIG.Common.RHEL9-x86_64
@@ -4,8 +4,9 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 BUILD_CLASS = HOST
 
 TOOLSET_LOCATION = /opt/rh
-TOOLSET = gcc-toolset-12
+TOOLSET = gcc-toolset-15
 STD_CXXFLAGS = -std=c++20
+STD_CFLAGS = -std=c17
 
 # Fix bug in gcc-toolset-11 calling the old assembler
 ifneq ($(filter %-11,$(TOOLSET)),)
diff --git a/configure/os/CONFIG_SITE.Common.linuxCommon b/configure/os/CONFIG_SITE.Common.linuxCommon
index f9ae0e2aa..dade772f4 100644
--- a/configure/os/CONFIG_SITE.Common.linuxCommon
+++ b/configure/os/CONFIG_SITE.Common.linuxCommon
@@ -12,6 +12,7 @@ COMMANDLINE_LIBRARY = READLINE
 
 USR_CXXFLAGS += $(STD_CXXFLAGS)
 STD_CXXFLAGS = -std=c++11
+USR_CFLAGS += $(STD_CFLAGS)
 
 TOOLSET_DIR      = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
 GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
diff --git a/epics-base.spec b/epics-base.spec
index b25e23170..fa10aaaf4 100644
--- a/epics-base.spec
+++ b/epics-base.spec
@@ -53,10 +53,10 @@ BuildRequires:  wine
 Summary:    Minimal stuff needed to build EPICS host apps
 Requires:   %{name} = %{version}-%{release}
 
-# This EPICS installation uses the toolset 12 compiler
+# This EPICS installation uses the toolset 15 compiler
 %if 0%{?rhel} >= 8
-Requires:       gcc-toolset-12-gcc-c++
-BuildRequires:  gcc-toolset-12-gcc-c++
+Requires:       gcc-toolset-15-gcc-c++
+BuildRequires:  gcc-toolset-15-gcc-c++
 %endif
 
 # The perl stuff we need