diff options
| author | martin <martin@pkgsrc.org> | 2019-11-13 19:06:42 +0000 |
|---|---|---|
| committer | martin <martin@pkgsrc.org> | 2019-11-13 19:06:42 +0000 |
| commit | 536036c3edc3cd964d645c60171d7ae6bacf0438 (patch) | |
| tree | c13f5773da8616310840b04ec9fc17c21489f4d2 /mk/gnu-config | |
| parent | 642e1c23c1523e30414c1e81223e0d9d2a7a5ced (diff) | |
| download | pkgsrc-536036c3edc3cd964d645c60171d7ae6bacf0438.tar.gz | |
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 (limited to 'mk/gnu-config')
| -rwxr-xr-x | mk/gnu-config/config.guess | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/gnu-config/config.guess b/mk/gnu-config/config.guess index 8e2a58b864f..a2c4684d30e 100755 --- a/mk/gnu-config/config.guess +++ b/mk/gnu-config/config.guess @@ -187,8 +187,10 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in 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 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # 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 |