From: Kefu Chai <kchai@redhat.com>
Date: Thu, 10 Dec 2020 10:53:42 +0000 (+0800)
Subject: scripts/build_utils: do not add tchaikov/gcc-toolset-9 copr repo anymore
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1721%2Fhead;p=ceph-build.git

scripts/build_utils: do not add tchaikov/gcc-toolset-9 copr repo anymore

since both CentOS and RHEL now include the updated
gcc-toolset-9-gcc-9.2.1-2.3.el8.

see also https://bugzilla.redhat.com/show_bug.cgi?id=1853900

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 314f24978..b95a77519 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1238,9 +1238,6 @@ setup_rpm_build_deps() {
     if [ "$FLAVOR" = "crimson" ]; then
         # enable more build depends required by crimson
         sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $DIR/ceph.spec
-        # use gcc-toolset-9 for the better support of C++17 from GCC
-        # see also https://bugzilla.redhat.com/show_bug.cgi?id=1853900
-        $SUDO dnf copr enable -y tchaikov/gcc-toolset-9 centos-stream-x86_64
     fi
 
     # Make sure we have all the rpm macros installed and at the latest version