epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

upgrade to gcc 15

Browse Source
This commit is contained in:
zimoch
2025-11-28 09:52:20 +01:00
parent eec358d70a
commit 3e5789afa6
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure/os/CONFIG.Common.RHEL8-x86_64
View File

@@ -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)),)

3
configure/os/CONFIG.Common.RHEL9-x86_64
View File

@@ -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)),)

1
configure/os/CONFIG_SITE.Common.linuxCommon
View File

@@ -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)

6
epics-base.spec
View File

@@ -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