Skip to content

Commit 1f0eec4

Browse files
authored
chore(manylinux2014): devtoolset 9 → 10 (#1155)
fix #1141
1 parent bce1ff9 commit 1f0eec4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ elif [ "${POLICY}" == "manylinux2014" ]; then
5050
else
5151
BASEIMAGE="${MULTIARCH_PREFIX}centos:7"
5252
fi
53-
DEVTOOLSET_ROOTPATH="/opt/rh/devtoolset-9/root"
53+
DEVTOOLSET_ROOTPATH="/opt/rh/devtoolset-10/root"
5454
PREPEND_PATH="${DEVTOOLSET_ROOTPATH}/usr/bin:"
5555
if [ "${PLATFORM}" == "i686" ]; then
5656
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"

docker/build_scripts/install-runtime-packages.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,20 @@ elif [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
8484
yum -y update
8585
yum -y install yum-utils curl
8686
yum-config-manager --enable extras
87-
TOOLCHAIN_DEPS="devtoolset-9-binutils devtoolset-9-gcc devtoolset-9-gcc-c++ devtoolset-9-gcc-gfortran"
87+
TOOLCHAIN_DEPS="devtoolset-10-binutils devtoolset-10-gcc devtoolset-10-gcc-c++ devtoolset-10-gcc-gfortran"
8888
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then
89-
# Software collection (for devtoolset-9)
89+
# Software collection (for devtoolset-10)
9090
yum -y install centos-release-scl-rh
9191
# EPEL support (for yasm)
9292
yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
9393
TOOLCHAIN_DEPS="${TOOLCHAIN_DEPS} yasm"
9494
elif [ "${AUDITWHEEL_ARCH}" == "aarch64" ] || [ "${AUDITWHEEL_ARCH}" == "ppc64le" ] || [ "${AUDITWHEEL_ARCH}" == "s390x" ]; then
95-
# Software collection (for devtoolset-9)
95+
# Software collection (for devtoolset-10)
9696
yum -y install centos-release-scl-rh
9797
elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then
9898
# No yasm on i686
99-
# Install mayeut/devtoolset-9 repo to get devtoolset-9
100-
curl -fsSLo /etc/yum.repos.d/mayeut-devtoolset-9.repo https://copr.fedorainfracloud.org/coprs/mayeut/devtoolset-9/repo/custom-1/mayeut-devtoolset-9-custom-1.repo
99+
# Install mayeut/devtoolset-10 repo to get devtoolset-10
100+
curl -fsSLo /etc/yum.repos.d/mayeut-devtoolset-10.repo https://copr.fedorainfracloud.org/coprs/mayeut/devtoolset-10/repo/custom-1/mayeut-devtoolset-10-custom-1.repo
101101
fi
102102
elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_24" ]; then
103103
PACKAGE_MANAGER=apt

0 commit comments

Comments
 (0)