From 882065dbf5d35a58627fffcaa790625d0fabb1b1 Mon Sep 17 00:00:00 2001 From: mayeut <mayeut@users.noreply.github.com> Date: Mon, 18 Nov 2024 20:27:44 +0100 Subject: [PATCH] feat: use gcc-toolset-14 --- README.rst | 2 +- build.sh | 2 +- docker/Dockerfile | 2 +- docker/build_scripts/install-runtime-packages.sh | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 96379179..388a88d7 100644 --- a/README.rst +++ b/README.rst @@ -97,7 +97,7 @@ for repeatable builds. manylinux_2_34 (AlmaLinux 9 based) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Toolchain: GCC 13 +Toolchain: GCC 14 - x86_64 image: ``quay.io/pypa/manylinux_2_34_x86_64`` - aarch64 image: ``quay.io/pypa/manylinux_2_34_aarch64`` diff --git a/build.sh b/build.sh index decc095d..25a720fe 100755 --- a/build.sh +++ b/build.sh @@ -46,7 +46,7 @@ elif [ "${POLICY}" == "manylinux_2_28" ]; then 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 BASEIMAGE="almalinux:9" - 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}" == "musllinux_1_2" ]; then diff --git a/docker/Dockerfile b/docker/Dockerfile index a725ad63..2d4b624c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BASEIMAGE=amd64/almalinux:9 ARG POLICY=manylinux_2_34 ARG PLATFORM=x86_64 -ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-13/root +ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-14/root ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst ARG PREPEND_PATH=${DEVTOOLSET_ROOTPATH}/usr/bin: diff --git a/docker/build_scripts/install-runtime-packages.sh b/docker/build_scripts/install-runtime-packages.sh index fde564ac..1ad4e5bd 100755 --- a/docker/build_scripts/install-runtime-packages.sh +++ b/docker/build_scripts/install-runtime-packages.sh @@ -112,10 +112,11 @@ 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-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