This simplifies some constructs that can confuse Emacs' syntax
highlighting and generally reduces the amount of quoting required.
This patch also somewhat standardizes spacing in a fairly common
pattern of applying some sed pattern to $UNAME_RELEASE.
* config.guess: factor out some command substitutions
---
config.guess | 62 +++++++++++++++++++++++++++++++++++-----------------
1 file changed, 42 insertions(+), 20 deletions(-)
diff --git a/config.guess b/config.guess
index 7d522eb..bb587c8 100755
--- a/config.guess
+++ b/config.guess
@@ -406,13 +406,16 @@ case
$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- GUESS=$UNAME_MACHINE-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e
's/[^.]*//')"
+ SUN_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')
+ GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
;;
sun4H:SunOS:5.*:*)
- GUESS=sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
+ SUN_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')
+ GUESS=sparc-hal-solaris2$SUN_REL
;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- GUESS=sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
+ SUN_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')
+ GUESS=sparc-sun-solaris2$SUN_REL
;;
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
GUESS=i386-pc-auroraux$UNAME_RELEASE
@@ -431,13 +434,15 @@ case
$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
SUN_ARCH=x86_64
fi
fi
- GUESS=$SUN_ARCH-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
+ SUN_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')
+ GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
;;
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.
- GUESS=sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
+ SUN_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')
+ GUESS=sparc-sun-solaris3$SUN_REL
;;
sun4*:SunOS:*:*)
case $(/usr/bin/arch -k) in
@@ -446,7 +451,8 @@ case
$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
- GUESS=sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')"
+ SUN_REL=$(echo "$UNAME_RELEASE" | sed -e 's/-/_/')
+ GUESS=sparc-sun-sunos$SUN_REL
;;
sun3*:SunOS:*:*)
GUESS=m68k-sun-sunos$UNAME_RELEASE
@@ -590,7 +596,8 @@ EOF
GUESS=m68k-tektronix-bsd
;;
*:IRIX*:*:*)
- GUESS=mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')"
+ IRIX_REL=$(echo "$UNAME_RELEASE" | sed -e 's/-/_/g')
+ GUESS=mips-sgi-irix$IRIX_REL
;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id
@@ -829,7 +836,8 @@ EOF
GUESS=c4-convex-bsd
;;
CRAY*Y-MP:*:*:*)
- GUESS=ymp-cray-unicos"$(echo "$UNAME_RELEASE" | sed -e
's/\.[^.]*$/.X/')"
+ CRAY_REL=$(echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/')
+ GUESS=ymp-cray-unicos$CRAY_REL
;;
CRAY*[A-Z]90:*:*:*)
echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
@@ -838,16 +846,20 @@ EOF
-e 's/\.[^.]*$/.X/'
exit ;;
CRAY*TS:*:*:*)
- GUESS=t90-cray-unicos"$(echo "$UNAME_RELEASE" | sed -e
's/\.[^.]*$/.X/')"
+ CRAY_REL=$(echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/')
+ GUESS=t90-cray-unicos$CRAY_REL
;;
CRAY*T3E:*:*:*)
- GUESS=alphaev5-cray-unicosmk"$(echo "$UNAME_RELEASE" | sed -e
's/\.[^.]*$/.X/')"
+ CRAY_REL=$(echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/')
+ GUESS=alphaev5-cray-unicosmk$CRAY_REL
;;
CRAY*SV1:*:*:*)
- GUESS=sv1-cray-unicos"$(echo "$UNAME_RELEASE" | sed -e
's/\.[^.]*$/.X/')"
+ CRAY_REL=$(echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/')
+ GUESS=sv1-cray-unicos$CRAY_REL
;;
*:UNICOS/mp:*:*)
- GUESS=craynv-cray-unicosmp"$(echo "$UNAME_RELEASE" | sed -e
's/\.[^.]*$/.X/')"
+ CRAY_REL=$(echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/')
+ GUESS=craynv-cray-unicosmp$CRAY_REL
;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ
abcdefghijklmnopqrstuvwxyz)
@@ -875,9 +887,11 @@ EOF
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- GUESS=${UNAME_PROCESSOR}-unknown-freebsd"$(echo
${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi
+ FREEBSD_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[-(].*//')
+ GUESS=${UNAME_PROCESSOR}-unknown-freebsd$FREEBSD_REL-gnueabi
else
- GUESS=${UNAME_PROCESSOR}-unknown-freebsd"$(echo
${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf
+ FREEBSD_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[-(].*//')
+ GUESS=${UNAME_PROCESSOR}-unknown-freebsd$FREEBSD_REL-gnueabihf
fi
;;
*:FreeBSD:*:*)
@@ -888,7 +902,8 @@ EOF
i386)
UNAME_PROCESSOR=i586 ;;
esac
- GUESS=$UNAME_PROCESSOR-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e
's/[-(].*//')"
+ FREEBSD_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[-(].*//')
+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
;;
i*:CYGWIN*:*)
GUESS=$UNAME_MACHINE-pc-cygwin
@@ -924,15 +939,20 @@ EOF
GUESS=x86_64-pc-cygwin
;;
prep*:SunOS:5.*:*)
- GUESS=powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e
's/[^.]*//')"
+ SUN_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')
+ GUESS=powerpcle-unknown-solaris2$SUN_REL
;;
*:GNU:*:*)
# the GNU system
- GUESS="$(echo "$UNAME_MACHINE"|sed -e
's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')"
+ GNU_ARCH=$(echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,')
+ GNU_REL=$(echo "$UNAME_RELEASE" | sed -e 's,/.*$,,')
+ GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- GUESS="$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed
's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e
's/[-(].*//')-$LIBC"
+ GNU_SYS=$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]"
"[:lower:]")
+ GNU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[-(].*//')
+ GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
;;
*:Minix:*:*)
GUESS=$UNAME_MACHINE-unknown-minix
@@ -1473,7 +1493,8 @@ EOF
GUESS=mips-sei-seiux$UNAME_RELEASE
;;
*:DragonFly:*:*)
- GUESS=$UNAME_MACHINE-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e
's/[-(].*//')"
+ DRAGONFLY_REL=$(echo "$UNAME_RELEASE" | sed -e 's/[-(].*//')
+ GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
;;
*:*VMS:*:*)
UNAME_MACHINE=$( (uname -p) 2>/dev/null)
@@ -1486,7 +1507,8 @@ EOF
GUESS=i386-pc-xenix
;;
i*86:skyos:*:*)
- GUESS=$UNAME_MACHINE-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/
.*$//')"
+ SKYOS_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')
+ GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
;;
i*86:rdos:*:*)
GUESS=$UNAME_MACHINE-pc-rdos
--
2.17.1
