Skip to content

Commit

Permalink
feature(manylinux2014): bump devtoolset-10 → devtoolset-11
Browse files Browse the repository at this point in the history
  • Loading branch information
mayeut committed Apr 2, 2022
1 parent 361e6b6 commit 4191cba
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ elif [ "${POLICY}" == "manylinux2014" ]; then
else
BASEIMAGE="${MULTIARCH_PREFIX}centos:7"
fi
DEVTOOLSET_ROOTPATH="/opt/rh/devtoolset-10/root"
DEVTOOLSET_ROOTPATH="/opt/rh/devtoolset-11/root"
PREPEND_PATH="${DEVTOOLSET_ROOTPATH}/usr/bin:"
if [ "${PLATFORM}" == "i686" ]; then
LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst"
Expand Down
10 changes: 5 additions & 5 deletions docker/build_scripts/install-runtime-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,20 @@ elif [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
yum -y update
yum -y install yum-utils curl
yum-config-manager --enable extras
TOOLCHAIN_DEPS="devtoolset-10-binutils devtoolset-10-gcc devtoolset-10-gcc-c++ devtoolset-10-gcc-gfortran"
TOOLCHAIN_DEPS="devtoolset-11-binutils devtoolset-11-gcc devtoolset-11-gcc-c++ devtoolset-11-gcc-gfortran"
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then
# Software collection (for devtoolset-10)
# Software collection (for devtoolset-11)
yum -y install centos-release-scl-rh
# EPEL support (for yasm)
yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
TOOLCHAIN_DEPS="${TOOLCHAIN_DEPS} yasm"
elif [ "${AUDITWHEEL_ARCH}" == "aarch64" ] || [ "${AUDITWHEEL_ARCH}" == "ppc64le" ] || [ "${AUDITWHEEL_ARCH}" == "s390x" ]; then
# Software collection (for devtoolset-10)
# Software collection (for devtoolset-11)
yum -y install centos-release-scl-rh
elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then
# No yasm on i686
# Install mayeut/devtoolset-10 repo to get devtoolset-10
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
# Install mayeut/devtoolset-11 repo to get devtoolset-11
curl -fsSLo /etc/yum.repos.d/mayeut-devtoolset-11.repo https://copr.fedorainfracloud.org/coprs/mayeut/devtoolset-11/repo/custom-1/mayeut-devtoolset-11-custom-1.repo
fi
elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_24" ]; then
PACKAGE_MANAGER=apt
Expand Down

0 comments on commit 4191cba

Please sign in to comment.