From 08ddf8271bc3bf25906f37f8938b0b3e8899b265 Mon Sep 17 00:00:00 2001
From: Hans Johnson <hans-johnson@uiowa.edu>
Date: Sat, 8 Feb 2025 10:38:33 -0600
Subject: [PATCH] ENH: Update manylinux_2_28-x64 to latest version
manylinux_2_28-x64 now supports the gcc 14 toolchain.
---
manylinux_2_28-x64/Dockerfile.in | 4 ++--
manylinux_2_28-x64/Toolchain.cmake | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/manylinux_2_28-x64/Dockerfile.in b/manylinux_2_28-x64/Dockerfile.in
index 25eec31..a2fb7dd 100644
--- a/manylinux_2_28-x64/Dockerfile.in
+++ b/manylinux_2_28-x64/Dockerfile.in
@@ -1,5 +1,5 @@
# Recent versions address yum functionality
-FROM quay.io/pypa/manylinux_2_28_x86_64:2024-07-20-e0def9a
+FROM quay.io/pypa/manylinux_2_28_x86_64:2025-02-06-fa3500c
LABEL maintainer="Matt McCormick matt@mmmccormick.com"
@@ -12,7 +12,7 @@ ENV DEFAULT_DOCKCROSS_IMAGE=dockcross/manylinux_2_28-x64
#include "common.docker"
ENV CROSS_TRIPLE=x86_64-linux-gnu
-ENV CROSS_ROOT=/opt/rh/gcc-toolset-12/root/bin/
+ENV CROSS_ROOT=/opt/rh/gcc-toolset-14/root/bin/
ENV AS=${CROSS_ROOT}/as \
AR=${CROSS_ROOT}/ar \
CC=${CROSS_ROOT}/gcc \
diff --git a/manylinux_2_28-x64/Toolchain.cmake b/manylinux_2_28-x64/Toolchain.cmake
index 82e4309..7b93e7d 100644
--- a/manylinux_2_28-x64/Toolchain.cmake
+++ b/manylinux_2_28-x64/Toolchain.cmake
@@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(MANYLINUX_2_28 TRUE)
-set(CROSS_ROOT /opt/rh/gcc-toolset-12/root/bin/)
+set(CROSS_ROOT /opt/rh/gcc-toolset-14/root/bin/)
set(CMAKE_C_COMPILER ${CROSS_ROOT}/gcc)
set(CMAKE_CXX_COMPILER ${CROSS_ROOT}/g++)
set(CMAKE_Fortran_COMPILER ${CROSS_ROOT}/gfortran)