Revert "ceph-*build/build/setup_rpm: downgrade to gcc-c++-8.2.1"

This reverts commit cf2c26b181a86738e2a8bb17545f45d6aa1c7c45.

since https://bugzilla.redhat.com/show_bug.cgi?id=1726630 has been
fixed. and we have devtoolset-8-gcc-c++-8.3.1-3.1.el7.x86_64.rpm.

no reason to stick to devtoolset-8-gcc-c++-8.2.1-3 anymore.

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

diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm
index cfd830ece79f8d73cfb48b602bedc53e395aadba..649279a36ec5c5e0435e97e3d03b899d1edcbbce 100644 (file)
--- a/ceph-build/build/setup_rpm
+++ b/ceph-build/build/setup_rpm
@@ -44,8 +44,6 @@ $SUDO yum install -y \*rpm-macros
 
 $SUDO yum-builddep -y $DIR/ceph.spec
 
-maybe_downgrade_gcc
-
 BRANCH=`branch_slash_filter $BRANCH`
 
 if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then

diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm
index 36fd8aa28697548775074de5acf3d4ab3b293a24..921021742fdff793a9f5b86c2b3aa135f93b4a06 100644 (file)
--- a/ceph-dev-build/build/setup_rpm
+++ b/ceph-dev-build/build/setup_rpm
@@ -44,8 +44,6 @@ $SUDO yum install -y \*rpm-macros
 
 $SUDO yum-builddep -y $DIR/ceph.spec
 
-maybe_downgrade_gcc
-
 BRANCH=`branch_slash_filter $BRANCH`
 
 if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then

diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm
index 36fd8aa28697548775074de5acf3d4ab3b293a24..921021742fdff793a9f5b86c2b3aa135f93b4a06 100644 (file)
--- a/ceph-dev-new-build/build/setup_rpm
+++ b/ceph-dev-new-build/build/setup_rpm
@@ -44,8 +44,6 @@ $SUDO yum install -y \*rpm-macros
 
 $SUDO yum-builddep -y $DIR/ceph.spec
 
-maybe_downgrade_gcc
-
 BRANCH=`branch_slash_filter $BRANCH`
 
 if [[ ! -f /etc/redhat-release && ! -f /usr/bin/zypper ]] ; then

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 5903badb2073b24aae731000a1fb27bab12d550d..a8197662aaf5dfae7b214c783aef023942a1ca61 100644 (file)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1005,12 +1005,3 @@ get_nr_build_jobs() {
     fi
     echo $n_build_jobs
 }
-
-maybe_downgrade_gcc() {
-    # see also https://bugzilla.redhat.com/show_bug.cgi?id=1726630
-    if [ $(rpm -q --queryformat "%{VERSION}" devtoolset-8-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
-}