ceph.spec.in,install-dep.sh: pin to gcc-c++-8.2.1

as an intermediate solution before
https://bugzilla.redhat.com/show_bug.cgi?id=1726630 gets fixed.

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 08c40ee0dbeaa19d47057106095ebf9b62cc6662..cc084d6990d894670d1fd4771ac4eb83064920ed 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -151,7 +151,8 @@ BuildRequires:      fuse-devel
 %if 0%{?rhel} == 7
 # devtoolset offers newer make and valgrind-devel, but the old ones are good
 # enough.
-BuildRequires: devtoolset-8-gcc-c++ >= 8.2.1
+# see https://github.com/ceph/ceph/pull/28859
+BuildRequires: devtoolset-8-gcc-c++ = 8.2.1
 %else
 BuildRequires: gcc-c++
 %endif

diff --git a/install-deps.sh b/install-deps.sh
index 4bc86a80a00b1f4ce4a6b817330d288ba7d4d4c6..4addfbed7cd107ce63408fe75cb453669e1299fc 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -197,6 +197,11 @@ 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
 }
 
 if [ x$(uname)x = xFreeBSDx ]; then