]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #30089 from tchaikov/wip-nautilus-gcc-8
authorYuri Weinstein <yweinste@redhat.com>
Sat, 16 Nov 2019 15:50:55 +0000 (07:50 -0800)
committerGitHub <noreply@github.com>
Sat, 16 Nov 2019 15:50:55 +0000 (07:50 -0800)
nautilus: build/ops: use gcc-8

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
ceph.spec.in
install-deps.sh

diff --cc ceph.spec.in
Simple merge
diff --cc install-deps.sh
index c7a35a1b80125fdc24ef5f563605195ba79c1411,daf2ae2c1f7b1a428adf84c940f2ef323b5fd673..8f671db1450a4df695962684685af643d0d9f92e
@@@ -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