diff --git a/README.rst b/README.rst index 847c5900..f4adb2e1 100644 --- a/README.rst +++ b/README.rst @@ -124,7 +124,7 @@ distros using glibc 2.34 or later, including: manylinux_2_28 (AlmaLinux 8 based) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Toolchain: GCC 13 +Toolchain: GCC 14 - x86_64 image: ``quay.io/pypa/manylinux_2_28_x86_64`` - aarch64 image: ``quay.io/pypa/manylinux_2_28_aarch64`` diff --git a/build.sh b/build.sh index 2b85d6c7..0aa30633 100755 --- a/build.sh +++ b/build.sh @@ -41,7 +41,7 @@ if [ "${POLICY}" == "manylinux2014" ]; then fi elif [ "${POLICY}" == "manylinux_2_28" ]; then BASEIMAGE="almalinux:8" - DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-13/root" + DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-14/root" PREPEND_PATH="${DEVTOOLSET_ROOTPATH}/usr/bin:" LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst" elif [ "${POLICY}" == "manylinux_2_34" ]; then diff --git a/docker/build_scripts/install-runtime-packages.sh b/docker/build_scripts/install-runtime-packages.sh index 1ad4e5bd..a6d420fa 100755 --- a/docker/build_scripts/install-runtime-packages.sh +++ b/docker/build_scripts/install-runtime-packages.sh @@ -112,11 +112,10 @@ elif [ "${OS_ID_LIKE}" == "rhel" ]; then dnf -y install dnf-plugins-core epel-release if [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then dnf config-manager --set-enabled powertools - TOOLCHAIN_DEPS="gcc-toolset-13-binutils gcc-toolset-13-gcc gcc-toolset-13-gcc-c++ gcc-toolset-13-gcc-gfortran" else dnf config-manager --set-enabled crb - TOOLCHAIN_DEPS="gcc-toolset-14-binutils gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-gfortran" fi + TOOLCHAIN_DEPS="gcc-toolset-14-binutils gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-gfortran" if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then TOOLCHAIN_DEPS="${TOOLCHAIN_DEPS} yasm" fi