From cf2c26b181a86738e2a8bb17545f45d6aa1c7c45 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 4 Jul 2019 14:31:55 +0800 Subject: [PATCH] ceph-*build/build/setup_rpm: downgrade to gcc-c++-8.2.1 Fixes: http://tracker.ceph.com/issues/40646 Signed-off-by: Kefu Chai --- ceph-build/build/setup_rpm | 2 ++ ceph-dev-build/build/setup_rpm | 2 ++ ceph-dev-new-build/build/setup_rpm | 2 ++ scripts/build_utils.sh | 9 +++++++++ 4 files changed, 15 insertions(+) diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm index 649279a3..cfd830ec 100644 --- a/ceph-build/build/setup_rpm +++ b/ceph-build/build/setup_rpm @@ -44,6 +44,8 @@ $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 92102174..36fd8aa2 100644 --- a/ceph-dev-build/build/setup_rpm +++ b/ceph-dev-build/build/setup_rpm @@ -44,6 +44,8 @@ $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 92102174..36fd8aa2 100644 --- a/ceph-dev-new-build/build/setup_rpm +++ b/ceph-dev-new-build/build/setup_rpm @@ -44,6 +44,8 @@ $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 6c27429d..ff8a630c 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -953,3 +953,12 @@ 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 +} -- 2.39.5