mirror of
https://github.com/ceph/ceph
synced 2025-04-11 04:02:04 +00:00
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>
This commit is contained in:
parent
507e97ae3c
commit
5ae3b06e63
@ -146,7 +146,11 @@ BuildRequires: fuse-devel
|
|||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
# devtoolset offers newer make and valgrind-devel, but the old ones are good
|
# devtoolset offers newer make and valgrind-devel, but the old ones are good
|
||||||
# enough.
|
# enough.
|
||||||
|
%ifarch x86_64
|
||||||
|
BuildRequires: devtoolset-8-gcc-c++ >= 8.2.1
|
||||||
|
%else
|
||||||
BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13
|
BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13
|
||||||
|
%endif
|
||||||
%else
|
%else
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
%endif
|
%endif
|
||||||
|
@ -183,11 +183,11 @@ function ensure_decent_gcc_on_rh {
|
|||||||
cat <<EOF
|
cat <<EOF
|
||||||
Your GCC is too old. Please run following command to add DTS to your environment:
|
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:
|
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.
|
see https://www.softwarecollections.org/en/scls/rhscl/devtoolset-7/ for more details.
|
||||||
EOF
|
EOF
|
||||||
@ -343,7 +343,7 @@ else
|
|||||||
case $(uname -m) in
|
case $(uname -m) in
|
||||||
x86_64)
|
x86_64)
|
||||||
$SUDO yum -y install centos-release-scl
|
$SUDO yum -y install centos-release-scl
|
||||||
dts_ver=7
|
dts_ver=8
|
||||||
;;
|
;;
|
||||||
aarch64)
|
aarch64)
|
||||||
$SUDO yum -y install centos-release-scl-rh
|
$SUDO yum -y install centos-release-scl-rh
|
||||||
@ -353,8 +353,10 @@ else
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
elif test $ID = rhel -a $MAJOR_VERSION = 7 ; then
|
elif test $ID = rhel -a $MAJOR_VERSION = 7 ; then
|
||||||
$SUDO yum-config-manager --enable rhel-server-rhscl-7-rpms
|
$SUDO yum-config-manager \
|
||||||
dts_ver=7
|
--enable rhel-server-rhscl-7-rpms \
|
||||||
|
--enable rhel-7-server-devtools-rpms
|
||||||
|
dts_ver=8
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
Loading…
Reference in New Issue
Block a user