RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-08 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Kefu Chai 2019-07-03 21:20:45 +08:00
parent 057a352be8
commit 47d4351d3a
2 changed files with 7 additions and 1 deletions

3
ceph.spec.in
View File

@ -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

5
install-deps.sh
View File

@ -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