Your message dated Mon, 05 Aug 2019 00:20:14 +0000
with message-id <e1huqjw-000gtj...@fasolo.debian.org>
and subject line Bug#933813: fixed in libffado 2.4.1-1
has caused the Debian Bug report #933813,
regarding libffado: please update admin/config.guess to support newer 
architectures
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
933813: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=933813
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: libffado
Version: 2.4.1-0.1
Severity: important
Tags: patch upstream
Justification: Policy 4.3
User: debian-ri...@lists.debian.org
Usertags: riscv64

libffado fail to build from source on riscv64 as the admin/config.guess
file is too old (2013-06-10) to recognize this architecture:

| I couldn't find the 'xdg-desktop-menu' and 'xdg-icon-resource' programs. These
| are needed to add the fancy entry for the mixer to your menu, but you can 
still
| start it by executing "ffado-mixer".
| Checking for dbus-1 (1.0 or higher)...        yes
| Checking for dbus-c++-1 (0 or higher)...      yes
| Checking for alsa (0 or higher)...    no
| Checking whether 'which dbusxx-xml2cpp' executes yes
| Checking for variable session_bus_services_dir in package dbus-1...   yes
| Trying to find the system triple: admin/config.guess: unable to guess system 
type
| 
| This script, last modified 2013-06-10, has failed to recognize
| the operating system you are using. It is advised that you
| download the most up to date version of the config scripts from
| 
|   
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
| and
|   
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
| 
| If the version you run (admin/config.guess) is already up to date, please
| send the following data and any information you think might be
| pertinent to <config-patc...@gnu.org> in order to provide the needed
| information to handle your system.
| 
| config.guess timestamp = 2013-06-10
| 
| uname -m = riscv64
| uname -r = 4.19.26
| uname -s = Linux
| uname -v = #3 SMP Sun Mar 3 11:02:26 UTC 2019

A full build log is available there:
https://buildd.debian.org/status/fetch.php?pkg=libffado&arch=riscv64&ver=2.4.1-0.1&stamp=1564856268&raw=0


As per Debian policy 4.3 this file should be updated at build time from
autotools-dev or at least regularly. Please find attached a patch
implementing the second option, as I am not sure how to do that with
CDBS and scons.
diff -Nru libffado-2.4.1/debian/patches/01-config.guess.patch 
libffado-2.4.1/debian/patches/01-config.guess.patch
--- libffado-2.4.1/debian/patches/01-config.guess.patch 1970-01-01 
00:00:00.000000000 +0000
+++ libffado-2.4.1/debian/patches/01-config.guess.patch 2019-08-03 
18:39:26.000000000 +0000
@@ -0,0 +1,1624 @@
+--- libffado-2.4.1.orig/admin/config.guess
++++ libffado-2.4.1/admin/config.guess
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright 1992-2013 Free Software Foundation, Inc.
++#   Copyright 1992-2018 Free Software Foundation, Inc.
+ 
+-timestamp='2013-06-10'
++timestamp='2018-02-24'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -15,7 +15,7 @@ timestamp='2013-06-10'
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, see <http://www.gnu.org/licenses/>.
++# along with this program; if not, see <https://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -24,12 +24,12 @@ timestamp='2013-06-10'
+ # program.  This Exception is an additional permission under section 7
+ # of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# Originally written by Per Bothner.
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ #
+ # You can get the latest version of this script from:
+-# 
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++# 
https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ #
+-# Please send patches with a ChangeLog entry to config-patc...@gnu.org.
++# Please send patches to <config-patc...@gnu.org>.
+ 
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
+ 
+ Output the configuration name of the system \`$me' is run on.
+ 
+-Operation modes:
++Options:
+   -h, --help         print this help, then exit
+   -t, --time-stamp   print date of last modification, then exit
+   -v, --version      print version number, then exit
+@@ -50,7 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright 1992-2013 Free Software Foundation, Inc.
++Copyright 1992-2018 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi
+ dummy=$tmp/dummy ;
+ tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+ case $CC_FOR_BUILD,$HOST_CC,$CC in
+- ,,)    echo "int x;" > $dummy.c ;
++ ,,)    echo "int x;" > "$dummy.c" ;
+       for c in cc gcc c89 c99 ; do
+-        if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++        if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+            CC_FOR_BUILD="$c"; break ;
+         fi ;
+       done ;
+@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-case "${UNAME_SYSTEM}" in
++case "$UNAME_SYSTEM" in
+ Linux|GNU|GNU/*)
+       # If the system lacks a compiler, then just pick glibc.
+       # We could probably try harder.
+       LIBC=gnu
+ 
+-      eval $set_cc_for_build
+-      cat <<-EOF > $dummy.c
++      eval "$set_cc_for_build"
++      cat <<-EOF > "$dummy.c"
+       #include <features.h>
+       #if defined(__UCLIBC__)
+       LIBC=uclibc
+@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
+       LIBC=gnu
+       #endif
+       EOF
+-      eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++      eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, 
,,g'`"
++
++      # If ldd exists, use it to detect musl libc.
++      if command -v ldd >/dev/null && \
++              ldd --version 2>&1 | grep -q ^musl
++      then
++          LIBC=musl
++      fi
+       ;;
+ esac
+ 
+ # Note: order is significant - the case branches are not exclusive.
+ 
+-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+     *:NetBSD:*:*)
+       # NetBSD (nbsd) targets should (where applicable) match one or
+       # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+@@ -168,21 +175,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+       # Note: NetBSD doesn't particularly care about the vendor
+       # portion of the name.  We always set it to "unknown".
+       sysctl="sysctl -n hw.machine_arch"
+-      UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+-          /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+-      case "${UNAME_MACHINE_ARCH}" in
++      UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
++          "/sbin/$sysctl" 2>/dev/null || \
++          "/usr/sbin/$sysctl" 2>/dev/null || \
++          echo unknown)`
++      case "$UNAME_MACHINE_ARCH" in
+           armeb) machine=armeb-unknown ;;
+           arm*) machine=arm-unknown ;;
+           sh3el) machine=shl-unknown ;;
+           sh3eb) machine=sh-unknown ;;
+           sh5el) machine=sh5le-unknown ;;
+-          *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++          earmv*)
++              arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 
's,^e\(armv[0-9]\).*$,\1,'`
++              endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 
's,^.*\(eb\)$,\1,p'`
++              machine="${arch}${endian}"-unknown
++              ;;
++          *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+       esac
+       # The Operating System including object format, if it has switched
+-      # to ELF recently, or will in the future.
+-      case "${UNAME_MACHINE_ARCH}" in
++      # to ELF recently (or will in the future) and ABI.
++      case "$UNAME_MACHINE_ARCH" in
++          earm*)
++              os=netbsdelf
++              ;;
+           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+-              eval $set_cc_for_build
++              eval "$set_cc_for_build"
+               if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+                       | grep -q __ELF__
+               then
+@@ -197,44 +214,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+               os=netbsd
+               ;;
+       esac
++      # Determine ABI tags.
++      case "$UNAME_MACHINE_ARCH" in
++          earm*)
++              expr='s/^earmv[0-9]/-eabi/;s/eb$//'
++              abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
++              ;;
++      esac
+       # The OS release
+       # Debian GNU/NetBSD machines have a different userland, and
+       # thus, need a distinct triplet. However, they do not need
+       # kernel version information, so it can be replaced with a
+       # suitable tag, in the style of linux-gnu.
+-      case "${UNAME_VERSION}" in
++      case "$UNAME_VERSION" in
+           Debian*)
+               release='-gnu'
+               ;;
+           *)
+-              release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++              release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. 
-f1,2`
+               ;;
+       esac
+       # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+       # contains redundant information, the shorter form:
+       # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+-      echo "${machine}-${os}${release}"
++      echo "$machine-${os}${release}${abi}"
+       exit ;;
+     *:Bitrig:*:*)
+       UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+-      echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++      echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+       exit ;;
+     *:OpenBSD:*:*)
+       UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+-      echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++      echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
++      exit ;;
++    *:LibertyBSD:*:*)
++      UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
++      echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
++      exit ;;
++    *:MidnightBSD:*:*)
++      echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+       exit ;;
+     *:ekkoBSD:*:*)
+-      echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++      echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+       exit ;;
+     *:SolidBSD:*:*)
+-      echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++      echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+       exit ;;
+     macppc:MirBSD:*:*)
+-      echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++      echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+       exit ;;
+     *:MirBSD:*:*)
+-      echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++      echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+       exit ;;
++    *:Sortix:*:*)
++      echo "$UNAME_MACHINE"-unknown-sortix
++      exit ;;
++    *:Redox:*:*)
++      echo "$UNAME_MACHINE"-unknown-redox
++      exit ;;
++    mips:OSF1:*.*)
++        echo mips-dec-osf1
++        exit ;;
+     alpha:OSF1:*:*)
+       case $UNAME_RELEASE in
+       *4.0)
+@@ -251,63 +291,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+       ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) 
processor.*$/\1/p' | head -n 1`
+       case "$ALPHA_CPU_TYPE" in
+           "EV4 (21064)")
+-              UNAME_MACHINE="alpha" ;;
++              UNAME_MACHINE=alpha ;;
+           "EV4.5 (21064)")
+-              UNAME_MACHINE="alpha" ;;
++              UNAME_MACHINE=alpha ;;
+           "LCA4 (21066/21068)")
+-              UNAME_MACHINE="alpha" ;;
++              UNAME_MACHINE=alpha ;;
+           "EV5 (21164)")
+-              UNAME_MACHINE="alphaev5" ;;
++              UNAME_MACHINE=alphaev5 ;;
+           "EV5.6 (21164A)")
+-              UNAME_MACHINE="alphaev56" ;;
++              UNAME_MACHINE=alphaev56 ;;
+           "EV5.6 (21164PC)")
+-              UNAME_MACHINE="alphapca56" ;;
++              UNAME_MACHINE=alphapca56 ;;
+           "EV5.7 (21164PC)")
+-              UNAME_MACHINE="alphapca57" ;;
++              UNAME_MACHINE=alphapca57 ;;
+           "EV6 (21264)")
+-              UNAME_MACHINE="alphaev6" ;;
++              UNAME_MACHINE=alphaev6 ;;
+           "EV6.7 (21264A)")
+-              UNAME_MACHINE="alphaev67" ;;
++              UNAME_MACHINE=alphaev67 ;;
+           "EV6.8CB (21264C)")
+-              UNAME_MACHINE="alphaev68" ;;
++              UNAME_MACHINE=alphaev68 ;;
+           "EV6.8AL (21264B)")
+-              UNAME_MACHINE="alphaev68" ;;
++              UNAME_MACHINE=alphaev68 ;;
+           "EV6.8CX (21264D)")
+-              UNAME_MACHINE="alphaev68" ;;
++              UNAME_MACHINE=alphaev68 ;;
+           "EV6.9A (21264/EV69A)")
+-              UNAME_MACHINE="alphaev69" ;;
++              UNAME_MACHINE=alphaev69 ;;
+           "EV7 (21364)")
+-              UNAME_MACHINE="alphaev7" ;;
++              UNAME_MACHINE=alphaev7 ;;
+           "EV7.9 (21364A)")
+-              UNAME_MACHINE="alphaev79" ;;
++              UNAME_MACHINE=alphaev79 ;;
+       esac
+       # A Pn.n version is a patched version.
+       # A Vn.n version is a released version.
+       # A Tn.n version is a released field test version.
+       # A Xn.n version is an unreleased experimental baselevel.
+       # 1.2 uses "1.2" for uname -r.
+-      echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 
's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++      echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 
's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
+       # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+       exitcode=$?
+       trap '' 0
+       exit $exitcode ;;
+-    Alpha\ *:Windows_NT*:*)
+-      # How do we know it's Interix rather than the generic POSIX subsystem?
+-      # Should we change UNAME_MACHINE based on the output of uname instead
+-      # of the specific Alpha model?
+-      echo alpha-pc-interix
+-      exit ;;
+-    21064:Windows_NT:50:3)
+-      echo alpha-dec-winnt3.5
+-      exit ;;
+     Amiga*:UNIX_System_V:4.0:*)
+       echo m68k-unknown-sysv4
+       exit ;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+-      echo ${UNAME_MACHINE}-unknown-amigaos
++      echo "$UNAME_MACHINE"-unknown-amigaos
+       exit ;;
+     *:[Mm]orph[Oo][Ss]:*:*)
+-      echo ${UNAME_MACHINE}-unknown-morphos
++      echo "$UNAME_MACHINE"-unknown-morphos
+       exit ;;
+     *:OS/390:*:*)
+       echo i370-ibm-openedition
+@@ -319,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+       echo powerpc-ibm-os400
+       exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+-      echo arm-acorn-riscix${UNAME_RELEASE}
++      echo arm-acorn-riscix"$UNAME_RELEASE"
+       exit ;;
+     arm*:riscos:*:*|arm*:RISCOS:*:*)
+       echo arm-unknown-riscos
+@@ -346,38 +377,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+           sparc) echo sparc-icl-nx7; exit ;;
+       esac ;;
+     s390x:SunOS:*:*)
+-      echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 
's/[^.]*//'`
++      echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 
's/[^.]*//'`"
+       exit ;;
+     sun4H:SunOS:5.*:*)
+-      echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++      echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+       exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+-      echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++      echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+       exit ;;
+     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+-      echo i386-pc-auroraux${UNAME_RELEASE}
++      echo i386-pc-auroraux"$UNAME_RELEASE"
+       exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+-      eval $set_cc_for_build
+-      SUN_ARCH="i386"
++      eval "$set_cc_for_build"
++      SUN_ARCH=i386
+       # If there is a compiler, see if it is configured for 64-bit objects.
+       # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+       # This test works for both compilers.
+-      if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++      if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+           if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+-              (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++              (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+               grep IS_64BIT_ARCH >/dev/null
+           then
+-              SUN_ARCH="x86_64"
++              SUN_ARCH=x86_64
+           fi
+       fi
+-      echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++      echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+       exit ;;
+     sun4*:SunOS:6*:*)
+       # According to config.sub, this is the proper way to canonicalize
+       # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+       # it's likely to be more like Solaris than SunOS4.
+-      echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++      echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+       exit ;;
+     sun4*:SunOS:*:*)
+       case "`/usr/bin/arch -k`" in
+@@ -386,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+               ;;
+       esac
+       # Japanese Language versions have a version number like `4.1.3-JL'.
+-      echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
++      echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+       exit ;;
+     sun3*:SunOS:*:*)
+-      echo m68k-sun-sunos${UNAME_RELEASE}
++      echo m68k-sun-sunos"$UNAME_RELEASE"
+       exit ;;
+     sun*:*:4.2BSD:*)
+       UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 
2>/dev/null`
+-      test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
++      test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+       case "`/bin/arch`" in
+           sun3)
+-              echo m68k-sun-sunos${UNAME_RELEASE}
++              echo m68k-sun-sunos"$UNAME_RELEASE"
+               ;;
+           sun4)
+-              echo sparc-sun-sunos${UNAME_RELEASE}
++              echo sparc-sun-sunos"$UNAME_RELEASE"
+               ;;
+       esac
+       exit ;;
+     aushp:SunOS:*:*)
+-      echo sparc-auspex-sunos${UNAME_RELEASE}
++      echo sparc-auspex-sunos"$UNAME_RELEASE"
+       exit ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+@@ -415,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+-      echo m68k-atari-mint${UNAME_RELEASE}
++      echo m68k-atari-mint"$UNAME_RELEASE"
+       exit ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+-      echo m68k-atari-mint${UNAME_RELEASE}
++      echo m68k-atari-mint"$UNAME_RELEASE"
+       exit ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+-      echo m68k-atari-mint${UNAME_RELEASE}
++      echo m68k-atari-mint"$UNAME_RELEASE"
+       exit ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+-      echo m68k-milan-mint${UNAME_RELEASE}
++      echo m68k-milan-mint"$UNAME_RELEASE"
+       exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-      echo m68k-hades-mint${UNAME_RELEASE}
++      echo m68k-hades-mint"$UNAME_RELEASE"
+       exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-      echo m68k-unknown-mint${UNAME_RELEASE}
++      echo m68k-unknown-mint"$UNAME_RELEASE"
+       exit ;;
+     m68k:machten:*:*)
+-      echo m68k-apple-machten${UNAME_RELEASE}
++      echo m68k-apple-machten"$UNAME_RELEASE"
+       exit ;;
+     powerpc:machten:*:*)
+-      echo powerpc-apple-machten${UNAME_RELEASE}
++      echo powerpc-apple-machten"$UNAME_RELEASE"
+       exit ;;
+     RISC*:Mach:*:*)
+       echo mips-dec-mach_bsd4.3
+       exit ;;
+     RISC*:ULTRIX:*:*)
+-      echo mips-dec-ultrix${UNAME_RELEASE}
++      echo mips-dec-ultrix"$UNAME_RELEASE"
+       exit ;;
+     VAX*:ULTRIX*:*:*)
+-      echo vax-dec-ultrix${UNAME_RELEASE}
++      echo vax-dec-ultrix"$UNAME_RELEASE"
+       exit ;;
+     2020:CLIX:*:* | 2430:CLIX:*:*)
+-      echo clipper-intergraph-clix${UNAME_RELEASE}
++      echo clipper-intergraph-clix"$UNAME_RELEASE"
+       exit ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+-      eval $set_cc_for_build
+-      sed 's/^        //' << EOF >$dummy.c
++      eval "$set_cc_for_build"
++      sed 's/^        //' << EOF > "$dummy.c"
+ #ifdef __cplusplus
+ #include <stdio.h>  /* for printf() prototype */
+       int main (int argc, char *argv[]) {
+@@ -461,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ #endif
+       #if defined (host_mips) && defined (MIPSEB)
+       #if defined (SYSTYPE_SYSV)
+-        printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
++        printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
+       #endif
+       #if defined (SYSTYPE_SVR4)
+-        printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
++        printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
+       #endif
+       #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+-        printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
++        printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
+       #endif
+       #endif
+         exit (-1);
+       }
+ EOF
+-      $CC_FOR_BUILD -o $dummy $dummy.c &&
+-        dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+-        SYSTEM_NAME=`$dummy $dummyarg` &&
++      $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
++        dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++        SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+           { echo "$SYSTEM_NAME"; exit; }
+-      echo mips-mips-riscos${UNAME_RELEASE}
++      echo mips-mips-riscos"$UNAME_RELEASE"
+       exit ;;
+     Motorola:PowerMAX_OS:*:*)
+       echo powerpc-motorola-powermax
+@@ -503,17 +534,17 @@ EOF
+     AViiON:dgux:*:*)
+       # DG/UX returns AViiON for all architectures
+       UNAME_PROCESSOR=`/usr/bin/uname -p`
+-      if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++      if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+       then
+-          if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+-             [ ${TARGET_BINARY_INTERFACE}x = x ]
++          if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
++             [ "$TARGET_BINARY_INTERFACE"x = x ]
+           then
+-              echo m88k-dg-dgux${UNAME_RELEASE}
++              echo m88k-dg-dgux"$UNAME_RELEASE"
+           else
+-              echo m88k-dg-dguxbcs${UNAME_RELEASE}
++              echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+           fi
+       else
+-          echo i586-dg-dgux${UNAME_RELEASE}
++          echo i586-dg-dgux"$UNAME_RELEASE"
+       fi
+       exit ;;
+     M88*:DolphinOS:*:*)       # DolphinOS (SVR3)
+@@ -530,7 +561,7 @@ EOF
+       echo m68k-tektronix-bsd
+       exit ;;
+     *:IRIX*:*:*)
+-      echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
++      echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
+       exit ;;
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+       echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+@@ -542,14 +573,14 @@ EOF
+       if [ -x /usr/bin/oslevel ] ; then
+               IBM_REV=`/usr/bin/oslevel`
+       else
+-              IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++              IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+       fi
+-      echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++      echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
+       exit ;;
+     *:AIX:2:3)
+       if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+-              eval $set_cc_for_build
+-              sed 's/^                //' << EOF >$dummy.c
++              eval "$set_cc_for_build"
++              sed 's/^                //' << EOF > "$dummy.c"
+               #include <sys/systemcfg.h>
+ 
+               main()
+@@ -560,7 +591,7 @@ EOF
+                       exit(0);
+                       }
+ EOF
+-              if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++              if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && 
SYSTEM_NAME=`"$dummy"`
+               then
+                       echo "$SYSTEM_NAME"
+               else
+@@ -574,26 +605,27 @@ EOF
+       exit ;;
+     *:AIX:*:[4567])
+       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk 
'{ print $1 }'`
+-      if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; 
then
++      if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; 
then
+               IBM_ARCH=rs6000
+       else
+               IBM_ARCH=powerpc
+       fi
+-      if [ -x /usr/bin/oslevel ] ; then
+-              IBM_REV=`/usr/bin/oslevel`
++      if [ -x /usr/bin/lslpp ] ; then
++              IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
++                         awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+       else
+-              IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++              IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+       fi
+-      echo ${IBM_ARCH}-ibm-aix${IBM_REV}
++      echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+       exit ;;
+     *:AIX:*:*)
+       echo rs6000-ibm-aix
+       exit ;;
+-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
++    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+       echo romp-ibm-bsd4.4
+       exit ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+-      echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
++      echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
+       exit ;;                             # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+       echo rs6000-bull-bosx
+@@ -608,28 +640,28 @@ EOF
+       echo m68k-hp-bsd4.4
+       exit ;;
+     9000/[34678]??:HP-UX:*:*)
+-      HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+-      case "${UNAME_MACHINE}" in
+-          9000/31? )            HP_ARCH=m68000 ;;
+-          9000/[34]?? )         HP_ARCH=m68k ;;
++      HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++      case "$UNAME_MACHINE" in
++          9000/31?)            HP_ARCH=m68000 ;;
++          9000/[34]??)         HP_ARCH=m68k ;;
+           9000/[678][0-9][0-9])
+               if [ -x /usr/bin/getconf ]; then
+                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                   sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+-                  case "${sc_cpu_version}" in
+-                    523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                    528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                  case "$sc_cpu_version" in
++                    523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
++                    528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+                     532)                      # CPU_PA_RISC2_0
+-                      case "${sc_kernel_bits}" in
+-                        32) HP_ARCH="hppa2.0n" ;;
+-                        64) HP_ARCH="hppa2.0w" ;;
+-                        '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
++                      case "$sc_kernel_bits" in
++                        32) HP_ARCH=hppa2.0n ;;
++                        64) HP_ARCH=hppa2.0w ;;
++                        '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
+                       esac ;;
+                   esac
+               fi
+-              if [ "${HP_ARCH}" = "" ]; then
+-                  eval $set_cc_for_build
+-                  sed 's/^            //' << EOF >$dummy.c
++              if [ "$HP_ARCH" = "" ]; then
++                  eval "$set_cc_for_build"
++                  sed 's/^            //' << EOF > "$dummy.c"
+ 
+               #define _HPUX_SOURCE
+               #include <stdlib.h>
+@@ -662,13 +694,13 @@ EOF
+                   exit (0);
+               }
+ EOF
+-                  (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && 
HP_ARCH=`$dummy`
++                  (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 
2>/dev/null) && HP_ARCH=`"$dummy"`
+                   test -z "$HP_ARCH" && HP_ARCH=hppa
+               fi ;;
+       esac
+-      if [ ${HP_ARCH} = "hppa2.0w" ]
++      if [ "$HP_ARCH" = hppa2.0w ]
+       then
+-          eval $set_cc_for_build
++          eval "$set_cc_for_build"
+ 
+           # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+           # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+@@ -679,23 +711,23 @@ EOF
+           # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+           # => hppa64-hp-hpux11.23
+ 
+-          if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++          if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+               grep -q __LP64__
+           then
+-              HP_ARCH="hppa2.0w"
++              HP_ARCH=hppa2.0w
+           else
+-              HP_ARCH="hppa64"
++              HP_ARCH=hppa64
+           fi
+       fi
+-      echo ${HP_ARCH}-hp-hpux${HPUX_REV}
++      echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+       exit ;;
+     ia64:HP-UX:*:*)
+-      HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+-      echo ia64-hp-hpux${HPUX_REV}
++      HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
++      echo ia64-hp-hpux"$HPUX_REV"
+       exit ;;
+     3050*:HI-UX:*:*)
+-      eval $set_cc_for_build
+-      sed 's/^        //' << EOF >$dummy.c
++      eval "$set_cc_for_build"
++      sed 's/^        //' << EOF > "$dummy.c"
+       #include <unistd.h>
+       int
+       main ()
+@@ -720,11 +752,11 @@ EOF
+         exit (0);
+       }
+ EOF
+-      $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++      $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+               { echo "$SYSTEM_NAME"; exit; }
+       echo unknown-hitachi-hiuxwe2
+       exit ;;
+-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
++    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+       echo hppa1.1-hp-bsd
+       exit ;;
+     9000/8??:4.3bsd:*:*)
+@@ -733,7 +765,7 @@ EOF
+     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+       echo hppa1.0-hp-mpeix
+       exit ;;
+-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
++    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+       echo hppa1.1-hp-osf
+       exit ;;
+     hp8??:OSF1:*:*)
+@@ -741,9 +773,9 @@ EOF
+       exit ;;
+     i*86:OSF1:*:*)
+       if [ -x /usr/sbin/sysversion ] ; then
+-          echo ${UNAME_MACHINE}-unknown-osf1mk
++          echo "$UNAME_MACHINE"-unknown-osf1mk
+       else
+-          echo ${UNAME_MACHINE}-unknown-osf1
++          echo "$UNAME_MACHINE"-unknown-osf1
+       fi
+       exit ;;
+     parisc*:Lites*:*:*)
+@@ -768,127 +800,109 @@ EOF
+       echo c4-convex-bsd
+       exit ;;
+     CRAY*Y-MP:*:*:*)
+-      echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++      echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
+     CRAY*[A-Z]90:*:*:*)
+-      echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
++      echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+       | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+             -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+             -e 's/\.[^.]*$/.X/'
+       exit ;;
+     CRAY*TS:*:*:*)
+-      echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++      echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
+     CRAY*T3E:*:*:*)
+-      echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++      echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
+     CRAY*SV1:*:*:*)
+-      echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++      echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
+     *:UNICOS/mp:*:*)
+-      echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++      echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+-      FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz'`
+-      FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-      FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++      FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ 
abcdefghijklmnopqrstuvwxyz`
++      FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ 
abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
++      FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+       echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+       exit ;;
+     5000:UNIX_System_V:4.*:*)
+-      FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-      FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 
'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++      FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ 
abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
++      FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ 
abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+       echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+       exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+-      echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
++      echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+       exit ;;
+     sparc*:BSD/OS:*:*)
+-      echo sparc-unknown-bsdi${UNAME_RELEASE}
++      echo sparc-unknown-bsdi"$UNAME_RELEASE"
+       exit ;;
+     *:BSD/OS:*:*)
+-      echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++      echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+       exit ;;
+     *:FreeBSD:*:*)
+       UNAME_PROCESSOR=`/usr/bin/uname -p`
+-      case ${UNAME_PROCESSOR} in
++      case "$UNAME_PROCESSOR" in
+           amd64)
+-              echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 
's/[-(].*//'` ;;
+-          *)
+-              echo ${UNAME_PROCESSOR}-unknown-freebsd`echo 
${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++              UNAME_PROCESSOR=x86_64 ;;
++          i386)
++              UNAME_PROCESSOR=i586 ;;
+       esac
++      echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 
's/[-(].*//'`"
+       exit ;;
+     i*:CYGWIN*:*)
+-      echo ${UNAME_MACHINE}-pc-cygwin
++      echo "$UNAME_MACHINE"-pc-cygwin
+       exit ;;
+     *:MINGW64*:*)
+-      echo ${UNAME_MACHINE}-pc-mingw64
++      echo "$UNAME_MACHINE"-pc-mingw64
+       exit ;;
+     *:MINGW*:*)
+-      echo ${UNAME_MACHINE}-pc-mingw32
+-      exit ;;
+-    i*:MSYS*:*)
+-      echo ${UNAME_MACHINE}-pc-msys
++      echo "$UNAME_MACHINE"-pc-mingw32
+       exit ;;
+-    i*:windows32*:*)
+-      # uname -m includes "-pc" on this system.
+-      echo ${UNAME_MACHINE}-mingw32
++    *:MSYS*:*)
++      echo "$UNAME_MACHINE"-pc-msys
+       exit ;;
+     i*:PW*:*)
+-      echo ${UNAME_MACHINE}-pc-pw32
++      echo "$UNAME_MACHINE"-pc-pw32
+       exit ;;
+     *:Interix*:*)
+-      case ${UNAME_MACHINE} in
++      case "$UNAME_MACHINE" in
+           x86)
+-              echo i586-pc-interix${UNAME_RELEASE}
++              echo i586-pc-interix"$UNAME_RELEASE"
+               exit ;;
+           authenticamd | genuineintel | EM64T)
+-              echo x86_64-unknown-interix${UNAME_RELEASE}
++              echo x86_64-unknown-interix"$UNAME_RELEASE"
+               exit ;;
+           IA64)
+-              echo ia64-unknown-interix${UNAME_RELEASE}
++              echo ia64-unknown-interix"$UNAME_RELEASE"
+               exit ;;
+       esac ;;
+-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+-      echo i${UNAME_MACHINE}-pc-mks
+-      exit ;;
+-    8664:Windows_NT:*)
+-      echo x86_64-pc-mks
+-      exit ;;
+-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+-      # How do we know it's Interix rather than the generic POSIX subsystem?
+-      # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+-      # UNAME_MACHINE based on the output of uname instead of i386?
+-      echo i586-pc-interix
+-      exit ;;
+     i*:UWIN*:*)
+-      echo ${UNAME_MACHINE}-pc-uwin
++      echo "$UNAME_MACHINE"-pc-uwin
+       exit ;;
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+       echo x86_64-unknown-cygwin
+       exit ;;
+-    p*:CYGWIN*:*)
+-      echo powerpcle-unknown-cygwin
+-      exit ;;
+     prep*:SunOS:5.*:*)
+-      echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 
's/[^.]*//'`
++      echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 
's/[^.]*//'`"
+       exit ;;
+     *:GNU:*:*)
+       # the GNU system
+-      echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo 
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++      echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo 
"$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
+       exit ;;
+     *:GNU/*:*:*)
+       # other systems with GNU libc and userland
+-      echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' 
| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
++      echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' 
| tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
+       exit ;;
+     i*86:Minix:*:*)
+-      echo ${UNAME_MACHINE}-pc-minix
++      echo "$UNAME_MACHINE"-pc-minix
+       exit ;;
+     aarch64:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     aarch64_be:Linux:*:*)
+       UNAME_MACHINE=aarch64_be
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     alpha:Linux:*:*)
+       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -901,58 +915,64 @@ EOF
+         EV68*) UNAME_MACHINE=alphaev68 ;;
+       esac
+       objdump --private-headers /bin/sh | grep -q ld.so.1
+-      if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     arc:Linux:*:* | arceb:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     arm*:Linux:*:*)
+-      eval $set_cc_for_build
++      eval "$set_cc_for_build"
+       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+           | grep -q __ARM_EABI__
+       then
+-          echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++          echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       else
+           if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+               | grep -q __ARM_PCS_VFP
+           then
+-              echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
++              echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+           else
+-              echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++              echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+           fi
+       fi
+       exit ;;
+     avr32*:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     cris:Linux:*:*)
+-      echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++      echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+       exit ;;
+     crisv32:Linux:*:*)
+-      echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++      echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
++      exit ;;
++    e2k:Linux:*:*)
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     frv:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     hexagon:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     i*86:Linux:*:*)
+-      echo ${UNAME_MACHINE}-pc-linux-${LIBC}
++      echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+       exit ;;
+     ia64:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
++      exit ;;
++    k1om:Linux:*:*)
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     m32r*:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     m68*:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     mips:Linux:*:* | mips64:Linux:*:*)
+-      eval $set_cc_for_build
+-      sed 's/^        //' << EOF >$dummy.c
++      eval "$set_cc_for_build"
++      sed 's/^        //' << EOF > "$dummy.c"
+       #undef CPU
+       #undef ${UNAME_MACHINE}
+       #undef ${UNAME_MACHINE}el
+@@ -966,64 +986,74 @@ EOF
+       #endif
+       #endif
+ EOF
+-      eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+-      test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++      eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
++      test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+       ;;
+-    or1k:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    mips64el:Linux:*:*)
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+-    or32:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    openrisc*:Linux:*:*)
++      echo or1k-unknown-linux-"$LIBC"
++      exit ;;
++    or32:Linux:*:* | or1k*:Linux:*:*)
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     padre:Linux:*:*)
+-      echo sparc-unknown-linux-${LIBC}
++      echo sparc-unknown-linux-"$LIBC"
+       exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-      echo hppa64-unknown-linux-${LIBC}
++      echo hppa64-unknown-linux-"$LIBC"
+       exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+       # Look for CPU level
+       case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+-        PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+-        PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+-        *)    echo hppa-unknown-linux-${LIBC} ;;
++        PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
++        PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
++        *)    echo hppa-unknown-linux-"$LIBC" ;;
+       esac
+       exit ;;
+     ppc64:Linux:*:*)
+-      echo powerpc64-unknown-linux-${LIBC}
++      echo powerpc64-unknown-linux-"$LIBC"
+       exit ;;
+     ppc:Linux:*:*)
+-      echo powerpc-unknown-linux-${LIBC}
++      echo powerpc-unknown-linux-"$LIBC"
+       exit ;;
+     ppc64le:Linux:*:*)
+-      echo powerpc64le-unknown-linux-${LIBC}
++      echo powerpc64le-unknown-linux-"$LIBC"
+       exit ;;
+     ppcle:Linux:*:*)
+-      echo powerpcle-unknown-linux-${LIBC}
++      echo powerpcle-unknown-linux-"$LIBC"
++      exit ;;
++    riscv32:Linux:*:* | riscv64:Linux:*:*)
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+-      echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
++      echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+       exit ;;
+     sh64*:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     sh*:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     tile*:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     vax:Linux:*:*)
+-      echo ${UNAME_MACHINE}-dec-linux-${LIBC}
++      echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+       exit ;;
+     x86_64:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      if objdump -f /bin/sh | grep -q elf32-x86-64; then
++          echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
++      else
++          echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
++      fi
+       exit ;;
+     xtensa*:Linux:*:*)
+-      echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++      echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+     i*86:DYNIX/ptx:4*:*)
+       # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1037,34 +1067,34 @@ EOF
+       # I am not positive that other SVR4 systems won't match this,
+       # I just have to hope.  -- rms.
+       # Use sysv4.2uw... so that sysv4* matches it.
+-      echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++      echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+       exit ;;
+     i*86:OS/2:*:*)
+       # If we were able to find `uname', then EMX Unix compatibility
+       # is probably installed.
+-      echo ${UNAME_MACHINE}-pc-os2-emx
++      echo "$UNAME_MACHINE"-pc-os2-emx
+       exit ;;
+     i*86:XTS-300:*:STOP)
+-      echo ${UNAME_MACHINE}-unknown-stop
++      echo "$UNAME_MACHINE"-unknown-stop
+       exit ;;
+     i*86:atheos:*:*)
+-      echo ${UNAME_MACHINE}-unknown-atheos
++      echo "$UNAME_MACHINE"-unknown-atheos
+       exit ;;
+     i*86:syllable:*:*)
+-      echo ${UNAME_MACHINE}-pc-syllable
++      echo "$UNAME_MACHINE"-pc-syllable
+       exit ;;
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+-      echo i386-unknown-lynxos${UNAME_RELEASE}
++      echo i386-unknown-lynxos"$UNAME_RELEASE"
+       exit ;;
+     i*86:*DOS:*:*)
+-      echo ${UNAME_MACHINE}-pc-msdosdjgpp
++      echo "$UNAME_MACHINE"-pc-msdosdjgpp
+       exit ;;
+-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+-      UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
++    i*86:*:4.*:*)
++      UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+       if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+-              echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
++              echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+       else
+-              echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
++              echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+       fi
+       exit ;;
+     i*86:*:5:[678]*)
+@@ -1074,12 +1104,12 @@ EOF
+           *Pentium)        UNAME_MACHINE=i586 ;;
+           *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+       esac
+-      echo 
${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++      echo 
"$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+       exit ;;
+     i*86:*:3.2:*)
+       if test -f /usr/options/cb.name; then
+               UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+-              echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
++              echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+       elif /bin/uname -X 2>/dev/null >/dev/null ; then
+               UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+               (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+@@ -1089,9 +1119,9 @@ EOF
+                       && UNAME_MACHINE=i686
+               (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+                       && UNAME_MACHINE=i686
+-              echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
++              echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+       else
+-              echo ${UNAME_MACHINE}-pc-sysv32
++              echo "$UNAME_MACHINE"-pc-sysv32
+       fi
+       exit ;;
+     pc:*:*:*)
+@@ -1099,7 +1129,7 @@ EOF
+       # uname -m prints for DJGPP always 'pc', but it prints nothing about
+       # the processor, so we play safe by assuming i586.
+       # Note: whatever this is, it MUST be the same as what config.sub
+-      # prints for the "djgpp" host, or else GDB configury will decide that
++      # prints for the "djgpp" host, or else GDB configure will decide that
+       # this is a cross-build.
+       echo i586-pc-msdosdjgpp
+       exit ;;
+@@ -1111,9 +1141,9 @@ EOF
+       exit ;;
+     i860:*:4.*:*) # i860-SVR4
+       if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+-        echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
++        echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+       else # Add other i860-SVR4 vendors below as they are discovered.
+-        echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
++        echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
+       fi
+       exit ;;
+     mini*:CTIX:SYS*5:*)
+@@ -1133,9 +1163,9 @@ EOF
+       test -r /etc/.relid \
+       && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-        && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++        && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-        && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++        && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+         && { echo i486-ncr-sysv4; exit; } ;;
+@@ -1144,28 +1174,28 @@ EOF
+       test -r /etc/.relid \
+           && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < 
/etc/.relid`
+       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++          && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-          && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++          && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+       /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+-          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
++          && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+-      echo m68k-unknown-lynxos${UNAME_RELEASE}
++      echo m68k-unknown-lynxos"$UNAME_RELEASE"
+       exit ;;
+     mc68030:UNIX_System_V:4.*:*)
+       echo m68k-atari-sysv4
+       exit ;;
+     TSUNAMI:LynxOS:2.*:*)
+-      echo sparc-unknown-lynxos${UNAME_RELEASE}
++      echo sparc-unknown-lynxos"$UNAME_RELEASE"
+       exit ;;
+     rs6000:LynxOS:2.*:*)
+-      echo rs6000-unknown-lynxos${UNAME_RELEASE}
++      echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+       exit ;;
+     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | 
PowerPC:LynxOS:4.[02]*:*)
+-      echo powerpc-unknown-lynxos${UNAME_RELEASE}
++      echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+       exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+-      echo mips-dde-sysv${UNAME_RELEASE}
++      echo mips-dde-sysv"$UNAME_RELEASE"
+       exit ;;
+     RM*:ReliantUNIX-*:*:*)
+       echo mips-sni-sysv4
+@@ -1176,7 +1206,7 @@ EOF
+     *:SINIX-*:*:*)
+       if uname -p 2>/dev/null >/dev/null ; then
+               UNAME_MACHINE=`(uname -p) 2>/dev/null`
+-              echo ${UNAME_MACHINE}-sni-sysv4
++              echo "$UNAME_MACHINE"-sni-sysv4
+       else
+               echo ns32k-sni-sysv
+       fi
+@@ -1196,23 +1226,23 @@ EOF
+       exit ;;
+     i*86:VOS:*:*)
+       # From paul.gr...@stratus.com.
+-      echo ${UNAME_MACHINE}-stratus-vos
++      echo "$UNAME_MACHINE"-stratus-vos
+       exit ;;
+     *:VOS:*:*)
+       # From paul.gr...@stratus.com.
+       echo hppa1.1-stratus-vos
+       exit ;;
+     mc68*:A/UX:*:*)
+-      echo m68k-apple-aux${UNAME_RELEASE}
++      echo m68k-apple-aux"$UNAME_RELEASE"
+       exit ;;
+     news*:NEWS-OS:6*:*)
+       echo mips-sony-newsos6
+       exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+       if [ -d /usr/nec ]; then
+-              echo mips-nec-sysv${UNAME_RELEASE}
++              echo mips-nec-sysv"$UNAME_RELEASE"
+       else
+-              echo mips-unknown-sysv${UNAME_RELEASE}
++              echo mips-unknown-sysv"$UNAME_RELEASE"
+       fi
+       exit ;;
+     BeBox:BeOS:*:*)   # BeOS running on hardware made by Be, PPC only.
+@@ -1231,67 +1261,93 @@ EOF
+       echo x86_64-unknown-haiku
+       exit ;;
+     SX-4:SUPER-UX:*:*)
+-      echo sx4-nec-superux${UNAME_RELEASE}
++      echo sx4-nec-superux"$UNAME_RELEASE"
+       exit ;;
+     SX-5:SUPER-UX:*:*)
+-      echo sx5-nec-superux${UNAME_RELEASE}
++      echo sx5-nec-superux"$UNAME_RELEASE"
+       exit ;;
+     SX-6:SUPER-UX:*:*)
+-      echo sx6-nec-superux${UNAME_RELEASE}
++      echo sx6-nec-superux"$UNAME_RELEASE"
+       exit ;;
+     SX-7:SUPER-UX:*:*)
+-      echo sx7-nec-superux${UNAME_RELEASE}
++      echo sx7-nec-superux"$UNAME_RELEASE"
+       exit ;;
+     SX-8:SUPER-UX:*:*)
+-      echo sx8-nec-superux${UNAME_RELEASE}
++      echo sx8-nec-superux"$UNAME_RELEASE"
+       exit ;;
+     SX-8R:SUPER-UX:*:*)
+-      echo sx8r-nec-superux${UNAME_RELEASE}
++      echo sx8r-nec-superux"$UNAME_RELEASE"
++      exit ;;
++    SX-ACE:SUPER-UX:*:*)
++      echo sxace-nec-superux"$UNAME_RELEASE"
+       exit ;;
+     Power*:Rhapsody:*:*)
+-      echo powerpc-apple-rhapsody${UNAME_RELEASE}
++      echo powerpc-apple-rhapsody"$UNAME_RELEASE"
+       exit ;;
+     *:Rhapsody:*:*)
+-      echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++      echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+       exit ;;
+     *:Darwin:*:*)
+       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+-      eval $set_cc_for_build
++      eval "$set_cc_for_build"
+       if test "$UNAME_PROCESSOR" = unknown ; then
+           UNAME_PROCESSOR=powerpc
+       fi
+-      if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+-          if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+-              (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+-              grep IS_64BIT_ARCH >/dev/null
+-          then
+-              case $UNAME_PROCESSOR in
+-                  i386) UNAME_PROCESSOR=x86_64 ;;
+-                  powerpc) UNAME_PROCESSOR=powerpc64 ;;
+-              esac
++      if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
++          if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
++              if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') 
| \
++                     (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++                     grep IS_64BIT_ARCH >/dev/null
++              then
++                  case $UNAME_PROCESSOR in
++                      i386) UNAME_PROCESSOR=x86_64 ;;
++                      powerpc) UNAME_PROCESSOR=powerpc64 ;;
++                  esac
++              fi
++              # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
++              if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
++                     (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++                     grep IS_PPC >/dev/null
++              then
++                  UNAME_PROCESSOR=powerpc
++              fi
+           fi
++      elif test "$UNAME_PROCESSOR" = i386 ; then
++          # Avoid executing cc on OS X 10.9, as it ships with a stub
++          # that puts up a graphical alert prompting to install
++          # developer tools.  Any system running Mac OS X 10.7 or
++          # later (Darwin 11 and later) is required to have a 64-bit
++          # processor. This is not true of the ARM version of Darwin
++          # that Apple uses in portable devices.
++          UNAME_PROCESSOR=x86_64
+       fi
+-      echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++      echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+       exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+       UNAME_PROCESSOR=`uname -p`
+-      if test "$UNAME_PROCESSOR" = "x86"; then
++      if test "$UNAME_PROCESSOR" = x86; then
+               UNAME_PROCESSOR=i386
+               UNAME_MACHINE=pc
+       fi
+-      echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++      echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+       exit ;;
+     *:QNX:*:4*)
+       echo i386-pc-qnx
+       exit ;;
+-    NEO-?:NONSTOP_KERNEL:*:*)
+-      echo neo-tandem-nsk${UNAME_RELEASE}
++    NEO-*:NONSTOP_KERNEL:*:*)
++      echo neo-tandem-nsk"$UNAME_RELEASE"
+       exit ;;
+     NSE-*:NONSTOP_KERNEL:*:*)
+-      echo nse-tandem-nsk${UNAME_RELEASE}
++      echo nse-tandem-nsk"$UNAME_RELEASE"
+       exit ;;
+-    NSR-?:NONSTOP_KERNEL:*:*)
+-      echo nsr-tandem-nsk${UNAME_RELEASE}
++    NSR-*:NONSTOP_KERNEL:*:*)
++      echo nsr-tandem-nsk"$UNAME_RELEASE"
++      exit ;;
++    NSV-*:NONSTOP_KERNEL:*:*)
++      echo nsv-tandem-nsk"$UNAME_RELEASE"
++      exit ;;
++    NSX-*:NONSTOP_KERNEL:*:*)
++      echo nsx-tandem-nsk"$UNAME_RELEASE"
+       exit ;;
+     *:NonStop-UX:*:*)
+       echo mips-compaq-nonstopux
+@@ -1300,18 +1356,18 @@ EOF
+       echo bs2000-siemens-sysv
+       exit ;;
+     DS/*:UNIX_System_V:*:*)
+-      echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++      echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
+       exit ;;
+     *:Plan9:*:*)
+       # "uname -m" is not consistent, so use $cputype instead. 386
+       # is converted to i386 for consistency with other x86
+       # operating systems.
+-      if test "$cputype" = "386"; then
++      if test "$cputype" = 386; then
+           UNAME_MACHINE=i386
+       else
+           UNAME_MACHINE="$cputype"
+       fi
+-      echo ${UNAME_MACHINE}-unknown-plan9
++      echo "$UNAME_MACHINE"-unknown-plan9
+       exit ;;
+     *:TOPS-10:*:*)
+       echo pdp10-unknown-tops10
+@@ -1332,14 +1388,14 @@ EOF
+       echo pdp10-unknown-its
+       exit ;;
+     SEI:*:*:SEIUX)
+-      echo mips-sei-seiux${UNAME_RELEASE}
++      echo mips-sei-seiux"$UNAME_RELEASE"
+       exit ;;
+     *:DragonFly:*:*)
+-      echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 
's/[-(].*//'`
++      echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 
's/[-(].*//'`"
+       exit ;;
+     *:*VMS:*:*)
+       UNAME_MACHINE=`(uname -p) 2>/dev/null`
+-      case "${UNAME_MACHINE}" in
++      case "$UNAME_MACHINE" in
+           A*) echo alpha-dec-vms ; exit ;;
+           I*) echo ia64-dec-vms ; exit ;;
+           V*) echo vax-dec-vms ; exit ;;
+@@ -1348,182 +1404,48 @@ EOF
+       echo i386-pc-xenix
+       exit ;;
+     i*86:skyos:*:*)
+-      echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ 
.*$//'
++      echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ 
.*$//'`"
+       exit ;;
+     i*86:rdos:*:*)
+-      echo ${UNAME_MACHINE}-pc-rdos
++      echo "$UNAME_MACHINE"-pc-rdos
+       exit ;;
+     i*86:AROS:*:*)
+-      echo ${UNAME_MACHINE}-pc-aros
++      echo "$UNAME_MACHINE"-pc-aros
+       exit ;;
+     x86_64:VMkernel:*:*)
+-      echo ${UNAME_MACHINE}-unknown-esx
++      echo "$UNAME_MACHINE"-unknown-esx
++      exit ;;
++    amd64:Isilon\ OneFS:*:*)
++      echo x86_64-unknown-onefs
+       exit ;;
+ esac
+ 
+-eval $set_cc_for_build
+-cat >$dummy.c <<EOF
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/utsname.h>
+-#endif
+-main ()
+-{
+-#if defined (sony)
+-#if defined (MIPSEB)
+-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+-     I don't know....  */
+-  printf ("mips-sony-bsd\n"); exit (0);
+-#else
+-#include <sys/param.h>
+-  printf ("m68k-sony-newsos%s\n",
+-#ifdef NEWSOS4
+-      "4"
+-#else
+-      ""
+-#endif
+-      ); exit (0);
+-#endif
+-#endif
+-
+-#if defined (__arm) && defined (__acorn) && defined (__unix)
+-  printf ("arm-acorn-riscix\n"); exit (0);
+-#endif
+-
+-#if defined (hp300) && !defined (hpux)
+-  printf ("m68k-hp-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (NeXT)
+-#if !defined (__ARCHITECTURE__)
+-#define __ARCHITECTURE__ "m68k"
+-#endif
+-  int version;
+-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+-  if (version < 4)
+-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+-  else
+-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+-  exit (0);
+-#endif
+-
+-#if defined (MULTIMAX) || defined (n16)
+-#if defined (UMAXV)
+-  printf ("ns32k-encore-sysv\n"); exit (0);
+-#else
+-#if defined (CMU)
+-  printf ("ns32k-encore-mach\n"); exit (0);
+-#else
+-  printf ("ns32k-encore-bsd\n"); exit (0);
+-#endif
+-#endif
+-#endif
+-
+-#if defined (__386BSD__)
+-  printf ("i386-pc-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (sequent)
+-#if defined (i386)
+-  printf ("i386-sequent-dynix\n"); exit (0);
+-#endif
+-#if defined (ns32000)
+-  printf ("ns32k-sequent-dynix\n"); exit (0);
+-#endif
+-#endif
+-
+-#if defined (_SEQUENT_)
+-    struct utsname un;
+-
+-    uname(&un);
+-
+-    if (strncmp(un.version, "V2", 2) == 0) {
+-      printf ("i386-sequent-ptx2\n"); exit (0);
+-    }
+-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+-      printf ("i386-sequent-ptx1\n"); exit (0);
+-    }
+-    printf ("i386-sequent-ptx\n"); exit (0);
+-
+-#endif
+-
+-#if defined (vax)
+-# if !defined (ultrix)
+-#  include <sys/param.h>
+-#  if defined (BSD)
+-#   if BSD == 43
+-      printf ("vax-dec-bsd4.3\n"); exit (0);
+-#   else
+-#    if BSD == 199006
+-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+-#    else
+-      printf ("vax-dec-bsd\n"); exit (0);
+-#    endif
+-#   endif
+-#  else
+-    printf ("vax-dec-bsd\n"); exit (0);
+-#  endif
+-# else
+-    printf ("vax-dec-ultrix\n"); exit (0);
+-# endif
+-#endif
++echo "$0: unable to guess system type" >&2
+ 
+-#if defined (alliant) && defined (i860)
+-  printf ("i860-alliant-bsd\n"); exit (0);
+-#endif
++case "$UNAME_MACHINE:$UNAME_SYSTEM" in
++    mips:Linux | mips64:Linux)
++      # If we got here on MIPS GNU/Linux, output extra information.
++      cat >&2 <<EOF
+ 
+-  exit (1);
+-}
++NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
++the system type. Please install a C compiler and try again.
+ EOF
+-
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+-      { echo "$SYSTEM_NAME"; exit; }
+-
+-# Apollos put the system type in the environment.
+-
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+-
+-# Convex versions that predate uname can use getsysinfo(1)
+-
+-if [ -x /usr/convex/getsysinfo ]
+-then
+-    case `getsysinfo -f cpu_type` in
+-    c1*)
+-      echo c1-convex-bsd
+-      exit ;;
+-    c2*)
+-      if getsysinfo -f scalar_acc
+-      then echo c32-convex-bsd
+-      else echo c2-convex-bsd
+-      fi
+-      exit ;;
+-    c34*)
+-      echo c34-convex-bsd
+-      exit ;;
+-    c38*)
+-      echo c38-convex-bsd
+-      exit ;;
+-    c4*)
+-      echo c4-convex-bsd
+-      exit ;;
+-    esac
+-fi
++      ;;
++esac
+ 
+ cat >&2 <<EOF
+-$0: unable to guess system type
+ 
+-This script, last modified $timestamp, has failed to recognize
+-the operating system you are using. It is advised that you
+-download the most up to date version of the config scripts from
++This script (version $timestamp), has failed to recognize the
++operating system you are using. If your script is old, overwrite *all*
++copies of config.guess and config.sub with the latest versions from:
+ 
+-  
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++  
https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ and
+-  
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ 
+-If the version you run ($0) is already up to date, please
+-send the following data and any information you think might be
+-pertinent to <config-patc...@gnu.org> in order to provide the needed
+-information to handle your system.
++If $0 has already been updated, send the following data and any
++information you think might be pertinent to config-patc...@gnu.org to
++provide the necessary information to handle your system.
+ 
+ config.guess timestamp = $timestamp
+ 
+@@ -1542,16 +1464,16 @@ hostinfo               = `(hostinfo) 2>/
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+ 
+-UNAME_MACHINE = ${UNAME_MACHINE}
+-UNAME_RELEASE = ${UNAME_RELEASE}
+-UNAME_SYSTEM  = ${UNAME_SYSTEM}
+-UNAME_VERSION = ${UNAME_VERSION}
++UNAME_MACHINE = "$UNAME_MACHINE"
++UNAME_RELEASE = "$UNAME_RELEASE"
++UNAME_SYSTEM  = "$UNAME_SYSTEM"
++UNAME_VERSION = "$UNAME_VERSION"
+ EOF
+ 
+ exit 1
+ 
+ # Local variables:
+-# eval: (add-hook 'write-file-hooks 'time-stamp)
++# eval: (add-hook 'write-file-functions 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
diff -Nru libffado-2.4.1/debian/patches/series 
libffado-2.4.1/debian/patches/series
--- libffado-2.4.1/debian/patches/series        1970-01-01 00:00:00.000000000 
+0000
+++ libffado-2.4.1/debian/patches/series        2019-08-03 18:39:26.000000000 
+0000
@@ -0,0 +1 @@
+01-config.guess.patch

--- End Message ---
--- Begin Message ---
Source: libffado
Source-Version: 2.4.1-1

We believe that the bug you reported is fixed in the latest version of
libffado, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 933...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Mattia Rizzolo <mat...@debian.org> (supplier of updated libffado package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Mon, 05 Aug 2019 01:30:48 +0200
Source: libffado
Architecture: source
Version: 2.4.1-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Changed-By: Mattia Rizzolo <mat...@debian.org>
Closes: 933813
Changes:
 libffado (2.4.1-1) unstable; urgency=medium
 .
   * Team upload.
   * Add a patch to stop using config.guess to determine the host CPU,
     instead using DEB_HOST_GNU_CPU.  Closes: #933813
Checksums-Sha1:
 ec841c47f0b5278e97aea0fd4a2834d2160e5e2e 2566 libffado_2.4.1-1.dsc
 ab71734ee75f2d747a2d4a7be53971dd9018c873 10816 libffado_2.4.1-1.debian.tar.xz
 d94af56c9c22fba3083ed3b042f536600d83d418 12881 libffado_2.4.1-1_amd64.buildinfo
Checksums-Sha256:
 d435565ca015be38aa19a9cd451965f7b06446de6f4f5830102effad49dc11a5 2566 
libffado_2.4.1-1.dsc
 b4604a4f3e04628a0b5eb06ef02faf7d4e11c15e7e7bb99928e0aeff863b6c76 10816 
libffado_2.4.1-1.debian.tar.xz
 a752abe3b5ea4f1f7e62f56722196ed543f3feb0de6009d57082a9691e42a30b 12881 
libffado_2.4.1-1_amd64.buildinfo
Files:
 3479a8ed1e29048f3f0c7284b88b20d0 2566 libs optional libffado_2.4.1-1.dsc
 4e1e822e76abfd567950f296b7256619 10816 libs optional 
libffado_2.4.1-1.debian.tar.xz
 202c16625628d8cc9baa225f807ab2fe 12881 libs optional 
libffado_2.4.1-1_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEi3hoeGwz5cZMTQpICBa54Yx2K60FAl1HbQwACgkQCBa54Yx2
K60fyxAAtV7gjyb2VBIEUFFW5zQ43FMDOm1bJMYWHC4LvbCPYP4GeJt/zmE6h2vO
YBa1j5D9bHudUnB30HiYiSE1GVG0sbK+iJjTOnp0Hsn+IGItbMPteEAHk9i506BJ
y7HZfMFGLSNWWZB3c+pRI/j0dQr5oAojbbwye4BtldSCncA/F+yFUSaL/cDoHvAk
3upzg56qFPXOjPopZcIRd5Z41KgmJwih9aqDKa7l+wiLeBosU66CO8CZ/enydPNJ
fJvjZ4o8GZCHbkbdJRFBP9hP8rpuYJel7rPu+eNKW0hHJw1j98wDeG8ZgqJ79ijv
X3QqmBkAg3pG6eZ2MTKxpSJpXuL82Xmy/7w87VaY85ghlpZ9Gx7qABuYVmGKwt+B
UJwcY1MoeEYICKOgqxXtdbR6Flp7sRH0ooeEI0i3xrIrTKSCFGtlWc0ViCtoEOZz
dgfcG4TOjoXhlXh+G/8+8FXduF0nXEFgcMiRis95LW3tcTG0U19NeDPy5skzfbSe
6gIH9HAc/0+gYaJIKDW/ph4sqQSVgkc9jti6/hrm6mIsXL0MkTSH7KRHg2cwmS0Z
O5X1zi8JPgREIKlzkHP8CjtSEasz78UC1g5kHL0skBnc3ujTrGRe7umu8oynVSSW
Rdl+/zC4dLZCToUzpFUaJXop/J7q1lIbSOqdm/dTEg27dKbaY9E=
=gEzJ
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to