From cdae2b2c26feda72f1d238a9dd2ecbfe04baa0f2 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 10 Nov 2017 09:32:13 +0800 Subject: [PATCH] install-deps.sh: install devtoolset-7 for centos/rhel ready them for gcc7 and libstdc++-7 for better performance. Signed-off-by: Kefu Chai (cherry picked from commit f9aa49cee15cd571a8dc2efcd46a54b0a1f68f89) Conflicts: install-deps.sh - leave shebang untouched: 3aae5ca6fda8b07ef875ae47c1b620aa3e2cdcd9 is not being backported --- install-deps.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 4f1ef9172e4ab..31bc47f1dab46 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -178,8 +178,10 @@ else $SUDO rm -f /etc/yum.repos.d/dl.fedoraproject.org* if test $(lsb_release -si) = CentOS -a $MAJOR_VERSION = 7 ; then $SUDO yum-config-manager --enable cr - fi - if test $(lsb_release -si) = VirtuozzoLinux -a $MAJOR_VERSION = 7 ; then + $SUDO yum install centos-release-scl + elif test $(lsb_release -si) = RedHatEnterpriseServer -a $MAJOR_VERSION = 7 ; then + $SUDO yum-config-manager --enable rhel-server-rhscl-7-rpms + elif test $(lsb_release -si) = VirtuozzoLinux -a $MAJOR_VERSION = 7 ; then $SUDO yum-config-manager --enable cr fi ;; -- 2.39.5