install-dep,rpm: use devtools-8 on amd64

seems devtools-8 is not packaged on aarch64. and we are suffering from
ICE on centos7 when building with GCC-7.3. so let's try GCC-8.2!

Fixes: http://tracker.ceph.com/issues/38892
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5ae3b06e63dcaceaaafcd6b4afa372eabf867e6c)

diff --git a/ceph.spec.in b/ceph.spec.in
index 734542815756d37bcb995ba55bdfd8716cbeb4f2..0445395ea1d6ddf32de72e73578b2ee6160a7a45 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -149,7 +149,11 @@ BuildRequires:     fuse-devel
 %if 0%{?rhel} == 7
 # devtoolset offers newer make and valgrind-devel, but the old ones are good
 # enough.
+%ifarch x86_64
+BuildRequires: devtoolset-8-gcc-c++ >= 8.2.1
+%else
 BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13
+%endif
 %else
 BuildRequires: gcc-c++
 %endif

diff --git a/install-deps.sh b/install-deps.sh
index 0a21dfcb635661fa08bdad17fd7bd6c64d4cee9c..bc1736b4bbfdf0a8f50b0c49fa869d681581d6c1 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -183,11 +183,11 @@ function ensure_decent_gcc_on_rh {
            cat <<EOF
 Your GCC is too old. Please run following command to add DTS to your environment:
 
-scl enable devtoolset-7 bash
+scl enable devtoolset-8 bash
 
 Or add following line to the end of ~/.bashrc to add it permanently:
 
-source scl_source enable devtoolset-7
+source scl_source enable devtoolset-8
 
 see https://www.softwarecollections.org/en/scls/rhscl/devtoolset-7/ for more details.
 EOF
@@ -343,7 +343,7 @@ else
                    case $(uname -m) in
                        x86_64)
                            $SUDO yum -y install centos-release-scl
-                           dts_ver=7
+                           dts_ver=8
                            ;;
                        aarch64)
                            $SUDO yum -y install centos-release-scl-rh
@@ -353,8 +353,10 @@ else
                            ;;
                    esac
                 elif test $ID = rhel -a $MAJOR_VERSION = 7 ; then
-                    $SUDO yum-config-manager --enable rhel-server-rhscl-7-rpms
-                    dts_ver=7
+                    $SUDO yum-config-manager \
+                         --enable rhel-server-rhscl-7-rpms \
+                         --enable rhel-7-server-devtools-rpms
+                    dts_ver=8
                 fi
                 ;;
         esac