From 9524941fe0d91b18975a69e49e40600655aa94f0 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 2 Nov 2024 08:12:24 +0100 Subject: [PATCH] feat: update gcc-toolset to gcc-toolset-13 on manylinux_2_28 --- README.rst | 2 +- build.sh | 2 +- docker/build_scripts/install-runtime-packages.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index d4c59740..9645f2f7 100644 --- a/README.rst +++ b/README.rst @@ -96,7 +96,7 @@ for repeatable builds. manylinux_2_28 (AlmaLinux 8 based) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Toolchain: GCC 12 +Toolchain: GCC 13 - 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 867fad05..b9c78b99 100755 --- a/build.sh +++ b/build.sh @@ -51,7 +51,7 @@ if [ "${POLICY}" == "manylinux2014" ]; then fi elif [ "${POLICY}" == "manylinux_2_28" ]; then BASEIMAGE="${MULTIARCH_PREFIX}almalinux:8" - DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-12/root" + DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-13/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}" == "musllinux_1_2" ]; then diff --git a/docker/build_scripts/install-runtime-packages.sh b/docker/build_scripts/install-runtime-packages.sh index 0c8ecf77..389cac17 100755 --- a/docker/build_scripts/install-runtime-packages.sh +++ b/docker/build_scripts/install-runtime-packages.sh @@ -99,7 +99,7 @@ elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then dnf -y upgrade dnf -y install dnf-plugins-core dnf config-manager --set-enabled powertools # for yasm - TOOLCHAIN_DEPS="gcc-toolset-12-binutils gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-gcc-gfortran" + TOOLCHAIN_DEPS="gcc-toolset-13-binutils gcc-toolset-13-gcc gcc-toolset-13-gcc-c++ gcc-toolset-13-gcc-gfortran" if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then TOOLCHAIN_DEPS="${TOOLCHAIN_DEPS} yasm" fi