From b3cc5e33aaf44b0bbf493e1a0d233f5f50091266 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Fri, 2 Oct 2026 15:50:08 +0200
Subject: [PATCH] Revert "upgrade to gcc 15"

This reverts commit 3e5789afa6a5654df444a960c2116e76c8e24d55.
Because we may have compatibility problems with 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, 5 insertions(+), 8 deletions(-)

diff --git a/configure/os/CONFIG.Common.RHEL8-x86_64 b/configure/os/CONFIG.Common.RHEL8-x86_64
index 2e8bc2a9e..7296a31a4 100644
--- a/configure/os/CONFIG.Common.RHEL8-x86_64
+++ b/configure/os/CONFIG.Common.RHEL8-x86_64
@@ -4,9 +4,8 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 BUILD_CLASS = HOST
 
 TOOLSET_LOCATION = /opt/rh
-TOOLSET = gcc-toolset-15
+TOOLSET = gcc-toolset-12
 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 2e8bc2a9e..7296a31a4 100644
--- a/configure/os/CONFIG.Common.RHEL9-x86_64
+++ b/configure/os/CONFIG.Common.RHEL9-x86_64
@@ -4,9 +4,8 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 BUILD_CLASS = HOST
 
 TOOLSET_LOCATION = /opt/rh
-TOOLSET = gcc-toolset-15
+TOOLSET = gcc-toolset-12
 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 dade772f4..f9ae0e2aa 100644
--- a/configure/os/CONFIG_SITE.Common.linuxCommon
+++ b/configure/os/CONFIG_SITE.Common.linuxCommon
@@ -12,7 +12,6 @@ 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 3d70b286b..b0e0d2099 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 15 compiler
+# This EPICS installation uses the toolset 12 compiler
 %if 0%{?rhel} >= 8
-Requires:       gcc-toolset-15-gcc-c++
-BuildRequires:  gcc-toolset-15-gcc-c++
+Requires:       gcc-toolset-12-gcc-c++
+BuildRequires:  gcc-toolset-12-gcc-c++
 %endif
 
 # The perl stuff we need