From 1d964b17fcdb44f9a5266cdca0bd37dff0d14e54 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 1 Aug 2021 09:48:14 +0200 Subject: [PATCH] =?UTF-8?q?chore(manylinux2014):=20devtoolset=209=20?= =?UTF-8?q?=E2=86=92=2010?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #1141 --- build.sh | 2 +- docker/build_scripts/install-runtime-packages.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index a331b9c09..b9dfca1ce 100755 --- a/build.sh +++ b/build.sh @@ -50,7 +50,7 @@ elif [ "${POLICY}" == "manylinux2014" ]; then else BASEIMAGE="${MULTIARCH_PREFIX}centos:7" fi - DEVTOOLSET_ROOTPATH="/opt/rh/devtoolset-9/root" + DEVTOOLSET_ROOTPATH="/opt/rh/devtoolset-10/root" PREPEND_PATH="${DEVTOOLSET_ROOTPATH}/usr/bin:" if [ "${PLATFORM}" == "i686" ]; then LD_LIBRARY_PATH_ARG="${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst" diff --git a/docker/build_scripts/install-runtime-packages.sh b/docker/build_scripts/install-runtime-packages.sh index 881cb34e8..db2a5744d 100755 --- a/docker/build_scripts/install-runtime-packages.sh +++ b/docker/build_scripts/install-runtime-packages.sh @@ -84,20 +84,20 @@ elif [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then yum -y update yum -y install yum-utils curl yum-config-manager --enable extras - TOOLCHAIN_DEPS="devtoolset-9-binutils devtoolset-9-gcc devtoolset-9-gcc-c++ devtoolset-9-gcc-gfortran" + TOOLCHAIN_DEPS="devtoolset-10-binutils devtoolset-10-gcc devtoolset-10-gcc-c++ devtoolset-10-gcc-gfortran" if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then - # Software collection (for devtoolset-9) + # Software collection (for devtoolset-10) 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-9) + # Software collection (for devtoolset-10) yum -y install centos-release-scl-rh elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then # No yasm on i686 - # Install mayeut/devtoolset-9 repo to get devtoolset-9 - 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 + # 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 fi elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_24" ]; then PACKAGE_MANAGER=apt