forked from pool/automake
935f237788
Copy from Base:System/automake based on submit request 18716 from user coolo OBS-URL: https://build.opensuse.org/request/show/18716 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/automake?expand=0&rev=15
279 lines
8.4 KiB
Diff
279 lines
8.4 KiB
Diff
Index: lib/config.guess
|
|
===================================================================
|
|
--- lib/config.guess.orig
|
|
+++ lib/config.guess
|
|
@@ -139,6 +139,16 @@ 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_MACHINE}" in
|
|
+ i?86)
|
|
+ test -z "$VENDOR" && VENDOR=pc
|
|
+ ;;
|
|
+ *)
|
|
+ test -z "$VENDOR" && VENDOR=unknown
|
|
+ ;;
|
|
+esac
|
|
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
|
|
+
|
|
# Note: order is significant - the case branches are not exclusive.
|
|
|
|
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|
@@ -856,13 +866,13 @@ EOF
|
|
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
|
| grep -q __ARM_EABI__
|
|
then
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
else
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
|
|
fi
|
|
exit ;;
|
|
avr32*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
cris:Linux:*:*)
|
|
echo cris-axis-linux-gnu
|
|
@@ -871,16 +881,16 @@ EOF
|
|
echo crisv32-axis-linux-gnu
|
|
exit ;;
|
|
frv:Linux:*:*)
|
|
- echo frv-unknown-linux-gnu
|
|
+ echo frv-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
ia64:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
m32r*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
m68*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
mips:Linux:*:*)
|
|
eval $set_cc_for_build
|
|
@@ -903,7 +913,7 @@ EOF
|
|
s: ::g
|
|
p
|
|
}'`"
|
|
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
|
|
;;
|
|
mips64:Linux:*:*)
|
|
eval $set_cc_for_build
|
|
@@ -926,16 +936,16 @@ EOF
|
|
s: ::g
|
|
p
|
|
}'`"
|
|
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
|
|
;;
|
|
or32:Linux:*:*)
|
|
- echo or32-unknown-linux-gnu
|
|
+ echo or32-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
ppc:Linux:*:*)
|
|
- echo powerpc-unknown-linux-gnu
|
|
+ echo powerpc-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
ppc64:Linux:*:*)
|
|
- echo powerpc64-unknown-linux-gnu
|
|
+ echo powerpc64-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
alpha:Linux:*:*)
|
|
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
@@ -949,7 +959,7 @@ EOF
|
|
esac
|
|
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
|
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
|
|
exit ;;
|
|
padre:Linux:*:*)
|
|
echo sparc-unknown-linux-gnu
|
|
@@ -957,34 +967,34 @@ EOF
|
|
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-gnu ;;
|
|
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
|
|
- *) echo hppa-unknown-linux-gnu ;;
|
|
+ PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
|
|
+ PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
|
|
+ *) echo hppa-${VENDOR}-linux-gnu ;;
|
|
esac
|
|
exit ;;
|
|
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
|
- echo hppa64-unknown-linux-gnu
|
|
+ echo hppa64-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
s390:Linux:*:* | s390x:Linux:*:*)
|
|
echo ${UNAME_MACHINE}-ibm-linux
|
|
exit ;;
|
|
sh64*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
sh*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
sparc:Linux:*:* | sparc64:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
vax:Linux:*:*)
|
|
echo ${UNAME_MACHINE}-dec-linux-gnu
|
|
exit ;;
|
|
x86_64:Linux:*:*)
|
|
- echo x86_64-unknown-linux-gnu
|
|
+ echo x86_64-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
xtensa*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
i*86:Linux:*:*)
|
|
# The BFD linker knows what the default object file format is, so
|
|
@@ -999,15 +1009,15 @@ EOF
|
|
p'`
|
|
case "$ld_supported_targets" in
|
|
elf32-i386)
|
|
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
|
|
+ TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
|
|
;;
|
|
a.out-i386-linux)
|
|
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
|
|
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
|
|
exit ;;
|
|
"")
|
|
# Either a pre-BFD a.out linker (linux-gnuoldld) or
|
|
# one that does not give us useful --help.
|
|
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
|
|
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
|
|
exit ;;
|
|
esac
|
|
# Determine whether the default compiler is a.out or elf
|
|
@@ -1041,7 +1051,7 @@ EOF
|
|
p
|
|
}'`"
|
|
test x"${LIBC}" != x && {
|
|
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
|
|
exit
|
|
}
|
|
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
|
|
@@ -1066,16 +1076,16 @@ EOF
|
|
echo ${UNAME_MACHINE}-pc-os2-emx
|
|
exit ;;
|
|
i*86:XTS-300:*:STOP)
|
|
- echo ${UNAME_MACHINE}-unknown-stop
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-stop
|
|
exit ;;
|
|
i*86:atheos:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-atheos
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-atheos
|
|
exit ;;
|
|
i*86:syllable:*:*)
|
|
echo ${UNAME_MACHINE}-pc-syllable
|
|
exit ;;
|
|
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
|
|
- echo i386-unknown-lynxos${UNAME_RELEASE}
|
|
+ echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
|
|
exit ;;
|
|
i*86:*DOS:*:*)
|
|
echo ${UNAME_MACHINE}-pc-msdosdjgpp
|
|
@@ -1095,7 +1105,7 @@ 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}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
|
|
exit ;;
|
|
i*86:*:3.2:*)
|
|
if test -f /usr/options/cb.name; then
|
|
@@ -1134,7 +1144,7 @@ EOF
|
|
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
|
|
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-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
|
|
fi
|
|
exit ;;
|
|
mini*:CTIX:SYS*5:*)
|
|
@@ -1171,19 +1181,19 @@ EOF
|
|
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
|
|
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
|
|
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
|
|
- echo m68k-unknown-lynxos${UNAME_RELEASE}
|
|
+ echo m68k-${VENDOR}-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-${VENDOR}-lynxos${UNAME_RELEASE}
|
|
exit ;;
|
|
rs6000:LynxOS:2.*:*)
|
|
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
|
|
+ echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
|
|
exit ;;
|
|
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
|
|
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
|
|
+ echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
|
|
exit ;;
|
|
SM[BE]S:UNIX_SV:*:*)
|
|
echo mips-dde-sysv${UNAME_RELEASE}
|
|
@@ -1233,7 +1243,7 @@ EOF
|
|
if [ -d /usr/nec ]; then
|
|
echo mips-nec-sysv${UNAME_RELEASE}
|
|
else
|
|
- echo mips-unknown-sysv${UNAME_RELEASE}
|
|
+ echo mips-${VENDOR}-sysv${UNAME_RELEASE}
|
|
fi
|
|
exit ;;
|
|
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
|
|
@@ -1314,13 +1324,13 @@ EOF
|
|
else
|
|
UNAME_MACHINE="$cputype"
|
|
fi
|
|
- echo ${UNAME_MACHINE}-unknown-plan9
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-plan9
|
|
exit ;;
|
|
*:TOPS-10:*:*)
|
|
- echo pdp10-unknown-tops10
|
|
+ echo pdp10-${VENDOR}-tops10
|
|
exit ;;
|
|
*:TENEX:*:*)
|
|
- echo pdp10-unknown-tenex
|
|
+ echo pdp10-${VENDOR}-tenex
|
|
exit ;;
|
|
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
|
|
echo pdp10-dec-tops20
|
|
@@ -1329,16 +1339,16 @@ EOF
|
|
echo pdp10-xkl-tops20
|
|
exit ;;
|
|
*:TOPS-20:*:*)
|
|
- echo pdp10-unknown-tops20
|
|
+ echo pdp10-${VENDOR}-tops20
|
|
exit ;;
|
|
*:ITS:*:*)
|
|
- echo pdp10-unknown-its
|
|
+ echo pdp10-${VENDOR}-its
|
|
exit ;;
|
|
SEI:*:*:SEIUX)
|
|
echo mips-sei-seiux${UNAME_RELEASE}
|
|
exit ;;
|
|
*:DragonFly:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
|
exit ;;
|
|
*:*VMS:*:*)
|
|
UNAME_MACHINE=`(uname -p) 2>/dev/null`
|