From: Kefu Chai <kchai@redhat.com>
Date: Wed, 4 Sep 2019 01:15:18 +0000 (+0800)
Subject: install-deps: revert 47d4351d
X-Git-Tag: v15.1.0~1680^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30122%2Fhead;p=ceph.git

install-deps: revert 47d4351d

this change reverts 47d4351d3ad2787ae7781d868608eb0e3c7797c7

see also 33dfffc8

Fixes: https://tracker.ceph.com/issues/40646
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/install-deps.sh b/install-deps.sh
index 5a0d336dfcd2..23b6e2f97ab7 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -224,11 +224,6 @@ EOF
 	    source /opt/rh/devtoolset-$dts_ver/enable
 	fi
     fi
-    if [ $(rpm -q --queryformat "%{VERSION}" devtoolset-$dts_ver-gcc-c++) = 8.3.1 ]; then
-        # rollback to avoid using a buggy version
-        $SUDO yum remove -y devtoolset-8-gcc-c++ devtoolset-8-gcc devtoolset-8-libstdc++-devel
-        $SUDO yum install -y devtoolset-8-gcc-c++-8.2.1-3.el7
-    fi
 }
 
 for_make_check=false