config.guess: manual fixups after previous automatic patch

The tool could not handle command substitutions that span lines, but
fortunately there were only two such substitutions in the script.

The test for which universe is active on Pyramid is rewritten into a
case block because it was the only use of a command substitution as an
argument to the test command, which would require quoting.

* config.guess: Rewrite "if" for Pyramid systems to "case".
This commit is contained in:
Jacob Bachmeyer 2021-05-25 23:59:02 -05:00 committed by Dmitry V. Levin
parent d70c4fa934
commit 598afeec95

17
config.guess vendored
View File

@ -202,10 +202,10 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
# #
# Note: NetBSD doesn't particularly care about the vendor # Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown". # portion of the name. We always set it to "unknown".
UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
/usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
echo unknown)) echo unknown)`
case $UNAME_MACHINE_ARCH in case $UNAME_MACHINE_ARCH in
aarch64eb) machine=aarch64_be-unknown ;; aarch64eb) machine=aarch64_be-unknown ;;
armeb) machine=armeb-unknown ;; armeb) machine=armeb-unknown ;;
@ -398,11 +398,10 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
;; ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then case `(/bin/universe) 2>/dev/null` in
GUESS=pyramid-pyramid-sysv3 att) GUESS=pyramid-pyramid-sysv3 ;;
else *) GUESS=pyramid-pyramid-bsd ;;
GUESS=pyramid-pyramid-bsd esac
fi
;; ;;
NILE*:*:*:dcosx) NILE*:*:*:dcosx)
GUESS=pyramid-pyramid-svr4 GUESS=pyramid-pyramid-svr4
@ -657,8 +656,8 @@ EOF
IBM_ARCH=powerpc IBM_ARCH=powerpc
fi fi
if test -x /usr/bin/lslpp ; then if test -x /usr/bin/lslpp ; then
IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc | IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/) awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else else
IBM_REV=$UNAME_VERSION.$UNAME_RELEASE IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
fi fi