Skip to content

Commit 882065d

Browse files
committed
feat: use gcc-toolset-14
1 parent ce283c4 commit 882065d

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ for repeatable builds.
9797
manylinux_2_34 (AlmaLinux 9 based)
9898
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9999

100-
Toolchain: GCC 13
100+
Toolchain: GCC 14
101101

102102
- x86_64 image: ``quay.io/pypa/manylinux_2_34_x86_64``
103103
- aarch64 image: ``quay.io/pypa/manylinux_2_34_aarch64``

build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ elif [ "${POLICY}" == "manylinux_2_28" ]; then
4646
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
4747
elif [ "${POLICY}" == "manylinux_2_34" ]; then
4848
BASEIMAGE="almalinux:9"
49-
DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-13/root"
49+
DEVTOOLSET_ROOTPATH="/opt/rh/gcc-toolset-14/root"
5050
PREPEND_PATH="${DEVTOOLSET_ROOTPATH}/usr/bin:"
5151
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
5252
elif [ "${POLICY}" == "musllinux_1_2" ]; then

docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ARG BASEIMAGE=amd64/almalinux:9
33
ARG POLICY=manylinux_2_34
44
ARG PLATFORM=x86_64
5-
ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-13/root
5+
ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-14/root
66
ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst
77
ARG PREPEND_PATH=${DEVTOOLSET_ROOTPATH}/usr/bin:
88

docker/build_scripts/install-runtime-packages.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,11 @@ elif [ "${OS_ID_LIKE}" == "rhel" ]; then
112112
dnf -y install dnf-plugins-core epel-release
113113
if [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
114114
dnf config-manager --set-enabled powertools
115+
TOOLCHAIN_DEPS="gcc-toolset-13-binutils gcc-toolset-13-gcc gcc-toolset-13-gcc-c++ gcc-toolset-13-gcc-gfortran"
115116
else
116117
dnf config-manager --set-enabled crb
118+
TOOLCHAIN_DEPS="gcc-toolset-14-binutils gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-gfortran"
117119
fi
118-
TOOLCHAIN_DEPS="gcc-toolset-13-binutils gcc-toolset-13-gcc gcc-toolset-13-gcc-c++ gcc-toolset-13-gcc-gfortran"
119120
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then
120121
TOOLCHAIN_DEPS="${TOOLCHAIN_DEPS} yasm"
121122
fi

0 commit comments

Comments
 (0)