From: Yuri Weinstein <yweinste@redhat.com>
Date: Sat, 16 Nov 2019 15:50:55 +0000 (-0800)
Subject: Merge pull request #30089 from tchaikov/wip-nautilus-gcc-8
X-Git-Tag: v14.2.5~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c338d6c82b32107b7d69b91d00c964a7c5eeaf4d;p=ceph.git

Merge pull request #30089 from tchaikov/wip-nautilus-gcc-8

nautilus: build/ops: use gcc-8

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

c338d6c82b32107b7d69b91d00c964a7c5eeaf4d
diff --cc install-deps.sh
index c7a35a1b801,daf2ae2c1f7..8f671db1450
--- a/install-deps.sh
+++ b/install-deps.sh
@@@ -97,10 -97,10 +97,10 @@@ msyaQpNl/m/lNtOLhR64v5ZybofB2EWkMxUzX8D
  -----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
 +    case "$codename" in
          trusty)
              old=4.8;;
          xenial)
@@@ -340,11 -340,10 +340,11 @@@ els
                  $SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$MAJOR_VERSION
                  $SUDO rm -f /etc/yum.repos.d/dl.fedoraproject.org*
                  if test $ID = centos -a $MAJOR_VERSION = 7 ; then
 -		    case $(uname -m) in
 +		    $SUDO $yumdnf install -y python36-devel
 +		    case "$ARCH" 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