[pkgsrc/trunk]: pkgsrc/mk/gnu-config PR pkg/54686: try to handle NetBSD/arm w...

[martin <martin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c012745f0acc
branches:  trunk
changeset: 343945:c012745f0acc
user:      martin <martin%pkgsrc.org@localhost>
date:      Wed Nov 13 19:06:42 2019 +0000

description:
PR pkg/54686: try to handle NetBSD/arm without architecture version the same
as {e,}armv4 or {e,}armv6 / {e,}armv7. We do not add an explicit version to
our current default (v5).

diffstat:

 mk/gnu-config/config.guess |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 4a8347299985 -r c012745f0acc mk/gnu-config/config.guess
--- a/mk/gnu-config/config.guess        Wed Nov 13 18:51:11 2019 +0000
+++ b/mk/gnu-config/config.guess        Wed Nov 13 19:06:42 2019 +0000
@@ -187,8 +187,10 @@
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
            sh5el) machine=sh5le-unknown ;;
-           earmv*)
-               arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+           earm*)
+               arch="${UNAME_MACHINE_ARCH#e}"
+               arch="${arch%eb}"
+               arch="${arch%hf}"
                endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
                machine="${arch}${endian}"-unknown
                ;;
@@ -219,7 +221,7 @@
        # Determine ABI tags.
        case "$UNAME_MACHINE_ARCH" in
            earm*)
-               expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+               expr='s/v[0-9]//;s/earm/-eabi/;s/eb$//'
                abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
                ;;
        esac