From f52d69ea9295b8e6a12cc83c49c380cd761a7bd8 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 14 May 2019 22:37:00 +0800 Subject: [PATCH] install-deps.sh: use gcc-8 on xenial and trusty to be consistent with #27183 and https://github.com/ceph/ceph-build/pull/1286 Signed-off-by: Kefu Chai --- install-deps.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 5baaf06e8ab..b8838c585e9 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -70,7 +70,7 @@ function ensure_decent_gcc_on_ubuntu { local old=$(gcc -dumpfullversion -dumpversion) local new=$1 local codename=$2 - if dpkg --compare-versions $old ge 7.0; then + if dpkg --compare-versions $old ge ${new}.0; then return fi @@ -97,7 +97,7 @@ msyaQpNl/m/lNtOLhR64v5ZybofB2EWkMxUzX8D/FQ== -----END PGP PUBLIC KEY BLOCK----- ENDOFKEY $SUDO env DEBIAN_FRONTEND=noninteractive apt-get update -y || true - $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y g++-7 + $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y g++-${new} fi case $codename in @@ -275,10 +275,10 @@ else $SUDO apt-get install -y dpkg-dev case "$VERSION" in *Trusty*) - ensure_decent_gcc_on_ubuntu 7 trusty + ensure_decent_gcc_on_ubuntu 8 trusty ;; *Xenial*) - ensure_decent_gcc_on_ubuntu 7 xenial + ensure_decent_gcc_on_ubuntu 8 xenial [ ! $NO_BOOST_PKGS ] && install_boost_on_ubuntu xenial ;; *Bionic*) -- 2.39.5