rpm/automake
SHA256
1
0
Fork 0
forked from pool/automake
Code Pull Requests Activity

- Update to 1.16.1. Changes since 1.15.1:

Browse Source 
- 'install-sh' now ensures that nobody can cross privilege boundaries by
    pre-creating symlink on the directory inside "/tmp".
  - 'automake' does not depend on the 'none' subroutine of the List::Util
    module anymore to support older Perl version. (automake bug#30631)
  - A regression in AM_PYTHON_PATH causing the rejection of non literal
    minimum version parameter hasn't been fixed. (automake bug#30616)
  * Miscellaneous changes
  - When subdir-objects is in effect, Automake will now construct
    shorter object file names when no programs and libraries name
    clashes are encountered.  This should make the discouraged use of
    'foo_SHORTNAME' unnecessary in many cases.
  * Bugs fixed:
  - Automatic dependency tracking has been fixed to work also when the
    'subdir-object' option is used and some 'foo_SOURCES' definition
    contains unexpanded references to make variables, as in, e.g.:
        a_src = sources/libs/aaa
        b_src = sources/bbb
        foo_SOURCES = $(a_src)/bar.c $(b_src)/baz.c
    With such a setup, the created makefile fragment containing dependency
    tracking information will be correctly placed under the directories
    named 'sources/libs/aaa/.deps' and 'sources/bbb/.deps', rather than
    mistakenly under directories named (literally!) '$(src_a)/.deps' and
    '$(src_b)/.deps' (this was the first part of automake bug#13928).
    Notice that in order to fix this bug we had to slightly change the
    semantics of how config.status bootstraps the makefile fragments
    required for the dependency tracking to work: rather than attempting
    to parse the Makefiles via grep and sed trickeries only, we actually
    invoke 'make' on a slightly preprocessed version of those Makefiles,
    using a private target that is only meant to bootstrap the required
    makefile fragments.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=63
This commit is contained in:
Philipp Thomas 2018-03-21 12:00:44 +00:00 committed by Git OBS Bridge
parent 134d746c06
commit 2a3c7964ce
9 changed files with 409 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
automake-1.15.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
size 1509496

3
automake-1.16.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921
size 1534936

16
automake-1.16.1.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE8qONfusrZkBXYQcNCt7hAJRgTTcFAlqlqd8ACgkQCt7hAJRg
TTfmxBAAgkCe+cqMbt1PbBByiVk0yQ59DWD7We3rzaFXM2/qnhw/LkDOSPoec/Hf
BGywRg+PEtuRa+GGjqLjFudR4eE2hu1J4NkBvLQz0FVQWYTDlPz/ril3w3hKsPr5
jnjkjDTpHmgtodG7v68Pz9gyJ3aFidcI2JdoNRC/nbJLCE8xnWCfd3qGd6hZTGsQ
yj0hPpqCBwlaZxgAWbAk8OdlfyQDVHXuPF9aY/LzlNfQsYvoLlOjp8Fdq0IHxSSj
LesRITZn0RfnXaaUXzkldUg36DNy+zFdej00oO+Oh+qunu3dnkUdpRXSiCRbW64s
xzFN4xYRfVNytQZ4GQsBnIcscKRq2ilJ/9vM42DnSyb9MlsJSFz8/s3TEMFjgkjO
UTg+pTLFfNfpmWRGjMScl638lTvFo7+PHlCvb2kIBpffL7dUED7KM0tDZqZA1M2c
cYM7V6P9EnaUdpTIqNznWlOL+wT4pkn6aamUzUDfHe/XTDUNCk4Q3ENrsmT5RDkN
vAx31GrUXy2njHFvJQ+7Uy9qkj+IuWN1Zv67+CAaam3pkVhV+qwmbkzRp9J+7pvu
g1r1RwsxfhtHwdzf1JAbElsfhYx0iTe3EHSaIxWuOQQ9aXjFIVghdPfj9sbPf+0t
PORmWeFlw3a2Esk7NzUfnM1UDc3o4ObRlSssATNEwOxnl3IATkI=
=bqhV
-----END PGP SIGNATURE-----

444
automake-SuSE.patch
View File

@ -1,12 +1,13 @@
--- ---
lib/config.guess | 156 +++++++++++++++++++++++++++++-------------------------- lib/config.guess | 172 +++++++++++++++++++++++++++++--------------------------
1 file changed, 83 insertions(+), 73 deletions(-) lib/config.sub | 10 ++-
2 files changed, 99 insertions(+), 83 deletions(-)
Index: automake-1.15.1/lib/config.guess Index: lib/config.guess
=================================================================== ===================================================================
--- automake-1.15.1.orig/lib/config.guess --- lib/config.guess.orig 2018-03-21 12:19:27.861785205 +0100
+++ automake-1.15.1/lib/config.guess +++ lib/config.guess 2018-03-21 12:34:07.619472760 +0100
@@ -153,6 +153,16 @@ Linux|GNU|GNU/*) @@ -160,6 +160,16 @@ Linux|GNU|GNU/*)
;; ;;
esac esac
@ -22,474 +23,477 @@ Index: automake-1.15.1/lib/config.guess
+ +
# Note: order is significant - the case branches are not exclusive. # Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
@@ -181,9 +191,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ @@ -188,9 +198,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
earmv*) earmv*)
arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown - machine="${arch}${endian}"-unknown
+ machine=${arch}${endian}-${VENDOR}-unknown + machine="${arch}${endian}"-$(VENDOR)-unknown
;; ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-${VENDOR}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-$(VENDOR)-unknown ;;
esac esac
# The Operating System including object format, if it has switched # The Operating System including object format, if it has switched
# to ELF recently (or will in the future) and ABI. # to ELF recently (or will in the future) and ABI.
@@ -234,30 +244,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ @@ -241,36 +251,36 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
exit ;; exit ;;
*:Bitrig:*:*) *:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-$(VENDOR)-bitrig"$UNAME_RELEASE"
exit ;; exit ;;
*:OpenBSD:*:*) *:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-$(VENDOR)-openbsd"$UNAME_RELEASE"
exit ;; exit ;;
*:LibertyBSD:*:*) *:LibertyBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE_ARCH}-${VENDOR}-libertybsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-$(VENDOR)-libertybsd"$UNAME_RELEASE"
exit ;;
*:MidnightBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE"-$(VENDOR)-midnightbsd"$UNAME_RELEASE"
exit ;; exit ;;
*:ekkoBSD:*:*) *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-$(VENDOR)-ekkobsd"$UNAME_RELEASE"
exit ;; exit ;;
*:SolidBSD:*:*) *:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-$(VENDOR)-solidbsd"$UNAME_RELEASE"
exit ;; exit ;;
macppc:MirBSD:*:*) macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE} - echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+ echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE} + echo powerpc-$(VENDOR)-mirbsd"$UNAME_RELEASE"
exit ;; exit ;;
*:MirBSD:*:*) *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-$(VENDOR)-mirbsd"$UNAME_RELEASE"
exit ;; exit ;;
*:Sortix:*:*) *:Sortix:*:*)
- echo ${UNAME_MACHINE}-unknown-sortix - echo "$UNAME_MACHINE"-unknown-sortix
+ echo ${UNAME_MACHINE}-${VENDOR}-sortix + echo "$UNAME_MACHINE"-$(VENDOR)-sortix
exit ;; exit ;;
alpha:OSF1:*:*) *:Redox:*:*)
case $UNAME_RELEASE in - echo "$UNAME_MACHINE"-unknown-redox
@@ -325,13 +335,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + echo "$UNAME_MACHINE"-$(VENDOR)-redox
echo alpha-dec-winnt3.5
exit ;; exit ;;
mips:OSF1:*.*)
echo mips-dec-osf1
@@ -332,13 +342,13 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
trap '' 0
exit $exitcode ;;
Amiga*:UNIX_System_V:4.0:*) Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4 - echo m68k-unknown-sysv4
+ echo m68k-${VENDOR}-sysv4 + echo m68k-$(VENDOR)-sysv4
exit ;; exit ;;
*:[Aa]miga[Oo][Ss]:*:*) *:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos - echo "$UNAME_MACHINE"-unknown-amigaos
+ echo ${UNAME_MACHINE}-${VENDOR}-amigaos + echo "$UNAME_MACHINE"-$(VENDOR)-amigaos
exit ;; exit ;;
*:[Mm]orph[Oo][Ss]:*:*) *:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos - echo "$UNAME_MACHINE"-unknown-morphos
+ echo ${UNAME_MACHINE}-${VENDOR}-morphos + echo "$UNAME_MACHINE"-$(VENDOR)-morphos
exit ;; exit ;;
*:OS/390:*:*) *:OS/390:*:*)
echo i370-ibm-openedition echo i370-ibm-openedition
@@ -346,7 +356,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ @@ -353,7 +363,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
echo arm-acorn-riscix${UNAME_RELEASE} echo arm-acorn-riscix"$UNAME_RELEASE"
exit ;; exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*) arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos - echo arm-unknown-riscos
+ echo arm-${VENDOR}-riscos + echo arm-$(VENDOR)-riscos
exit ;; exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp echo hppa1.1-hitachi-hiuxmpp
@@ -454,7 +464,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ @@ -461,7 +471,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
echo m68k-hades-mint${UNAME_RELEASE} echo m68k-hades-mint"$UNAME_RELEASE"
exit ;; exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE} - echo m68k-unknown-mint"$UNAME_RELEASE"
+ echo m68k-${VENDOR}-mint${UNAME_RELEASE} + echo m68k-$(VENDOR)-mint"$UNAME_RELEASE"
exit ;; exit ;;
m68k:machten:*:*) m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE} echo m68k-apple-machten"$UNAME_RELEASE"
@@ -766,9 +776,9 @@ EOF @@ -773,9 +783,9 @@ EOF
exit ;; exit ;;
i*86:OSF1:*:*) i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk - echo "$UNAME_MACHINE"-unknown-osf1mk
+ echo ${UNAME_MACHINE}-${VENDOR}-osf1mk + echo "$UNAME_MACHINE"-$(VENDOR)-osf1mk
else else
- echo ${UNAME_MACHINE}-unknown-osf1 - echo "$UNAME_MACHINE"-unknown-osf1
+ echo ${UNAME_MACHINE}-${VENDOR}-osf1 + echo "$UNAME_MACHINE"-$(VENDOR)-osf1
fi fi
exit ;; exit ;;
parisc*:Lites*:*:*) parisc*:Lites*:*:*)
@@ -828,10 +838,10 @@ EOF @@ -835,10 +845,10 @@ EOF
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
exit ;; exit ;;
sparc*:BSD/OS:*:*) sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE} - echo sparc-unknown-bsdi"$UNAME_RELEASE"
+ echo sparc-${VENDOR}-bsdi${UNAME_RELEASE} + echo sparc-$(VENDOR)-bsdi"$UNAME_RELEASE"
exit ;; exit ;;
*:BSD/OS:*:*) *:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-$(VENDOR)-bsdi"$UNAME_RELEASE"
exit ;; exit ;;
*:FreeBSD:*:*) *:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p` UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -841,7 +851,7 @@ EOF @@ -848,7 +858,7 @@ EOF
i386) i386)
UNAME_PROCESSOR=i586 ;; UNAME_PROCESSOR=i586 ;;
esac esac
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_PROCESSOR"-$(VENDOR)-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;; exit ;;
i*:CYGWIN*:*) i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin echo "$UNAME_MACHINE"-pc-cygwin
@@ -868,10 +878,10 @@ EOF @@ -871,38 +881,38 @@ EOF
echo i586-pc-interix${UNAME_RELEASE} echo i586-pc-interix"$UNAME_RELEASE"
exit ;; exit ;;
authenticamd | genuineintel | EM64T) authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE} - echo x86_64-unknown-interix"$UNAME_RELEASE"
+ echo x86_64-${VENDOR}-interix${UNAME_RELEASE} + echo x86_64-$(VENDOR)-interix"$UNAME_RELEASE"
exit ;; exit ;;
IA64) IA64)
- echo ia64-unknown-interix${UNAME_RELEASE} - echo ia64-unknown-interix"$UNAME_RELEASE"
+ echo ia64-${VENDOR}-interix${UNAME_RELEASE} + echo ia64-$(VENDOR)-interix"$UNAME_RELEASE"
exit ;; exit ;;
esac ;; esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) i*:UWIN*:*)
@@ -890,31 +900,31 @@ EOF echo "$UNAME_MACHINE"-pc-uwin
echo ${UNAME_MACHINE}-pc-uwin
exit ;; exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin - echo x86_64-unknown-cygwin
+ echo x86_64-${VENDOR}-cygwin + echo x86_64-$(VENDOR)-cygwin
exit ;;
p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
+ echo powerpcle-${VENDOR}-cygwin
exit ;; exit ;;
prep*:SunOS:5.*:*) prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-$(VENDOR)-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;; exit ;;
*:GNU:*:*) *:GNU:*:*)
# the GNU system # the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-$(VENDOR)-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
exit ;; exit ;;
*:GNU/*:*:*) *:GNU/*:*:*)
# other systems with GNU libc and userland # other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-$(VENDOR)-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
exit ;; exit ;;
i*86:Minix:*:*) i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix echo "$UNAME_MACHINE"-pc-minix
exit ;; exit ;;
aarch64:Linux:*:*) aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
aarch64_be:Linux:*:*) aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
alpha:Linux:*:*) alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -928,29 +938,29 @@ EOF @@ -916,29 +926,29 @@ EOF
esac esac
objdump --private-headers /bin/sh | grep -q ld.so.1 objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
arc:Linux:*:* | arceb:Linux:*:*) arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
arm*:Linux:*:*) arm*:Linux:*:*)
eval $set_cc_for_build eval "$set_cc_for_build"
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__ | grep -q __ARM_EABI__
then then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
else else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP | grep -q __ARM_PCS_VFP
then then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"eabi
else else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"eabihf
fi fi
fi fi
exit ;; exit ;;
avr32*:Linux:*:*) avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
cris:Linux:*:*) cris:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC} echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
@@ -959,28 +969,28 @@ EOF @@ -947,28 +957,28 @@ EOF
echo ${UNAME_MACHINE}-axis-linux-${LIBC} echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;; exit ;;
e2k:Linux:*:*) e2k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
frv:Linux:*:*) frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
hexagon:Linux:*:*) hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
i*86:Linux:*:*) i*86:Linux:*:*)
echo ${UNAME_MACHINE}-pc-linux-${LIBC} echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;; exit ;;
ia64:Linux:*:*) ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
k1om:Linux:*:*) k1om:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
m32r*:Linux:*:*) m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
m68*:Linux:*:*) m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
mips:Linux:*:* | mips64:Linux:*:*) mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build eval "$set_cc_for_build"
@@ -999,60 +1009,60 @@ EOF @@ -987,60 +997,60 @@ EOF
#endif #endif
EOF EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; } + test "x$CPU" != x && { echo "$CPU-$(VENDOR)-linux-$LIBC"; exit; }
;; ;;
mips64el:Linux:*:*) mips64el:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
openrisc*:Linux:*:*) openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC} - echo or1k-unknown-linux-"$LIBC"
+ echo or1k-${VENDOR}-linux-${LIBC} + echo or1k-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
or32:Linux:*:* | or1k*:Linux:*:*) or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
padre:Linux:*:*) padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC} - echo sparc-unknown-linux-"$LIBC"
+ echo sparc-${VENDOR}-linux-${LIBC} + echo sparc-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*) parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC} - echo hppa64-unknown-linux-"$LIBC"
+ echo hppa64-${VENDOR}-linux-${LIBC} + echo hppa64-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
parisc:Linux:*:* | hppa:Linux:*:*) parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level # Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
- *) echo hppa-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-"$LIBC" ;;
+ PA7*) echo hppa1.1-${VENDOR}-linux-${LIBC} ;; + PA7*) echo hppa1.1-$(VENDOR)-linux-"$LIBC" ;;
+ PA8*) echo hppa2.0-${VENDOR}-linux-${LIBC} ;; + PA8*) echo hppa2.0-$(VENDOR)-linux-"$LIBC" ;;
+ *) echo hppa-${VENDOR}-linux-${LIBC} ;; + *) echo hppa-$(VENDOR)-linux-"$LIBC" ;;
esac esac
exit ;; exit ;;
ppc64:Linux:*:*) ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC} - echo powerpc64-unknown-linux-"$LIBC"
+ echo powerpc64-${VENDOR}-linux-${LIBC} + echo powerpc64-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
ppc:Linux:*:*) ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC} - echo powerpc-unknown-linux-"$LIBC"
+ echo powerpc-${VENDOR}-linux-${LIBC} + echo powerpc-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
ppc64le:Linux:*:*) ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC} - echo powerpc64le-unknown-linux-"$LIBC"
+ echo powerpc64le-${VENDOR}-linux-${LIBC} + echo powerpc64le-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
ppcle:Linux:*:*) ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC} - echo powerpcle-unknown-linux-"$LIBC"
+ echo powerpcle-${VENDOR}-linux-${LIBC} + echo powerpcle-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
riscv32:Linux:*:* | riscv64:Linux:*:*) riscv32:Linux:*:* | riscv64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
s390:Linux:*:* | s390x:Linux:*:*) s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux-${LIBC} echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
exit ;; exit ;;
sh64*:Linux:*:*) sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
sh*:Linux:*:*) sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*) sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
tile*:Linux:*:*) tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
vax:Linux:*:*) vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-${LIBC} echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
@@ -1061,7 +1071,7 @@ EOF @@ -1049,7 +1059,7 @@ EOF
echo ${UNAME_MACHINE}-pc-linux-${LIBC} echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;; exit ;;
xtensa*:Linux:*:*) xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
exit ;; exit ;;
i*86:DYNIX/ptx:4*:*) i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1083,16 +1093,16 @@ EOF @@ -1071,16 +1081,16 @@ EOF
echo ${UNAME_MACHINE}-pc-os2-emx echo "$UNAME_MACHINE"-pc-os2-emx
exit ;; exit ;;
i*86:XTS-300:*:STOP) i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop - echo "$UNAME_MACHINE"-unknown-stop
+ echo ${UNAME_MACHINE}-${VENDOR}-stop + echo "$UNAME_MACHINE"-$(VENDOR)-stop
exit ;; exit ;;
i*86:atheos:*:*) i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos - echo "$UNAME_MACHINE"-unknown-atheos
+ echo ${UNAME_MACHINE}-${VENDOR}-atheos + echo "$UNAME_MACHINE"-$(VENDOR)-atheos
exit ;; exit ;;
i*86:syllable:*:*) i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable echo "$UNAME_MACHINE"-pc-syllable
exit ;; exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE} - echo i386-unknown-lynxos"$UNAME_RELEASE"
+ echo i386-${VENODR}-lynxos${UNAME_RELEASE} + echo i386-$(VENDOR)-lynxos"$UNAME_RELEASE"
exit ;; exit ;;
i*86:*DOS:*:*) i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp echo "$UNAME_MACHINE"-pc-msdosdjgpp
@@ -1112,7 +1122,7 @@ EOF @@ -1100,7 +1110,7 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;; *Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+ echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-$(VENDOR)-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
exit ;; exit ;;
i*86:*:3.2:*) i*86:*:3.2:*)
if test -f /usr/options/cb.name; then if test -f /usr/options/cb.name; then
@@ -1151,7 +1161,7 @@ EOF @@ -1139,7 +1149,7 @@ EOF
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered. else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
+ echo i860-${VENODR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-$(VENDOR)-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
fi fi
exit ;; exit ;;
mini*:CTIX:SYS*5:*) mini*:CTIX:SYS*5:*)
@@ -1188,19 +1198,19 @@ EOF @@ -1176,19 +1186,19 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE} - echo m68k-unknown-lynxos"$UNAME_RELEASE"
+ echo m68k-${VENDOR}-lynxos${UNAME_RELEASE} + echo m68k-$(VENDOR)-lynxos"$UNAME_RELEASE"
exit ;; exit ;;
mc68030:UNIX_System_V:4.*:*) mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4 echo m68k-atari-sysv4
exit ;; exit ;;
TSUNAMI:LynxOS:2.*:*) TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE} - echo sparc-unknown-lynxos"$UNAME_RELEASE"
+ echo sparc-${VENDOR}-lynxos${UNAME_RELEASE} + echo sparc-$(VENDOR)-lynxos"$UNAME_RELEASE"
exit ;; exit ;;
rs6000:LynxOS:2.*:*) rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE} - echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+ echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE} + echo rs6000-$(VENDOR)-lynxos"$UNAME_RELEASE"
exit ;; exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE} - echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+ echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE} + echo powerpc-$(VENDOR)-lynxos"$UNAME_RELEASE"
exit ;; exit ;;
SM[BE]S:UNIX_SV:*:*) SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE} echo mips-dde-sysv"$UNAME_RELEASE"
@@ -1250,7 +1260,7 @@ EOF @@ -1238,7 +1248,7 @@ EOF
if [ -d /usr/nec ]; then if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE} echo mips-nec-sysv"$UNAME_RELEASE"
else else
- echo mips-unknown-sysv${UNAME_RELEASE} - echo mips-unknown-sysv"$UNAME_RELEASE"
+ echo mips-${VENDOR}-sysv${UNAME_RELEASE} + echo mips-$(VENDOR)-sysv"$UNAME_RELEASE"
fi fi
exit ;; exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1266,7 +1276,7 @@ EOF @@ -1254,7 +1264,7 @@ EOF
echo i586-pc-haiku echo i586-pc-haiku
exit ;; exit ;;
x86_64:Haiku:*:*) x86_64:Haiku:*:*)
- echo x86_64-unknown-haiku - echo x86_64-unknown-haiku
+ echo x86_64-${VENDOR}-haiku + echo x86_64-$(VENDOR)-haiku
exit ;; exit ;;
SX-4:SUPER-UX:*:*) SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE} echo sx4-nec-superux"$UNAME_RELEASE"
@@ -1372,13 +1382,13 @@ EOF @@ -1363,13 +1373,13 @@ EOF
else else
UNAME_MACHINE="$cputype" UNAME_MACHINE="$cputype"
fi fi
- echo ${UNAME_MACHINE}-unknown-plan9 - echo "$UNAME_MACHINE"-unknown-plan9
+ echo ${UNAME_MACHINE}-${VENDOR}-plan9 + echo "$UNAME_MACHINE"-$(VENDOR)-plan9
exit ;; exit ;;
*:TOPS-10:*:*) *:TOPS-10:*:*)
- echo pdp10-unknown-tops10 - echo pdp10-unknown-tops10
+ echo pdp10-${VENDOR}-tops10 + echo pdp10-$(VENDOR)-tops10
exit ;; exit ;;
*:TENEX:*:*) *:TENEX:*:*)
- echo pdp10-unknown-tenex - echo pdp10-unknown-tenex
+ echo pdp10-${VENDOR}-tenex + echo pdp10-$(VENDOR)-tenex
exit ;; exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20 echo pdp10-dec-tops20
@@ -1387,16 +1397,16 @@ EOF @@ -1378,16 +1388,16 @@ EOF
echo pdp10-xkl-tops20 echo pdp10-xkl-tops20
exit ;; exit ;;
*:TOPS-20:*:*) *:TOPS-20:*:*)
- echo pdp10-unknown-tops20 - echo pdp10-unknown-tops20
+ echo pdp10-${VENDOR}-tops20 + echo pdp10-$(VENDOR)-tops20
exit ;; exit ;;
*:ITS:*:*) *:ITS:*:*)
- echo pdp10-unknown-its - echo pdp10-unknown-its
+ echo pdp10-${VENDOR}-its + echo pdp10-$(VENDOR)-its
exit ;; exit ;;
SEI:*:*:SEIUX) SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE} echo mips-sei-seiux"$UNAME_RELEASE"
exit ;; exit ;;
*:DragonFly:*:*) *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-$(VENDOR)-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;; exit ;;
*:*VMS:*:*) *:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null` UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1418,10 +1428,10 @@ EOF @@ -1409,10 +1419,10 @@ EOF
echo ${UNAME_MACHINE}-pc-aros echo "$UNAME_MACHINE"-pc-aros
exit ;; exit ;;
x86_64:VMkernel:*:*) x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx - echo "$UNAME_MACHINE"-unknown-esx
+ echo ${UNAME_MACHINE}-${VENDOR}-esx + echo "$UNAME_MACHINE"-$(VENDOR)-esx
exit ;; exit ;;
amd64:Isilon\ OneFS:*:*) amd64:Isilon\ OneFS:*:*)
- echo x86_64-unknown-onefs - echo x86_64-unknown-onefs
+ echo x86_64-${VENDOR}-onefs + echo x86_64-$(VENDOR)-onefs
exit ;; exit ;;
esac esac
Index: automake-1.15.1/lib/config.sub Index: lib/config.sub
=================================================================== ===================================================================
--- automake-1.15.1.orig/lib/config.sub --- lib/config.sub.orig 2018-03-21 12:19:25.009766883 +0100
+++ automake-1.15.1/lib/config.sub +++ lib/config.sub 2018-03-21 12:19:27.861785205 +0100
@@ -1078,12 +1078,18 @@ case $basic_machine in @@ -1071,12 +1071,18 @@ case $basic_machine in
rtpc | rtpc-*) rtpc | rtpc-*)
basic_machine=romp-ibm basic_machine=romp-ibm
;; ;;

8
automake-require_file.patch
View File

@ -2,11 +2,11 @@
bin/automake.in | 4 +++- bin/automake.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
Index: automake-1.15.1/bin/automake.in Index: automake-1.16.1/bin/automake.in
=================================================================== ===================================================================
--- automake-1.15.1.orig/bin/automake.in --- automake-1.16.1.orig/bin/automake.in 2018-03-08 21:27:05.000000000 +0100
+++ automake-1.15.1/bin/automake.in +++ automake-1.16.1/bin/automake.in 2018-03-21 12:35:37.288053253 +0100
@@ -7393,12 +7393,14 @@ sub required_file_check_or_copy @@ -7540,12 +7540,14 @@ sub required_file_check_or_copy
my $fullfile = "$dir/$file"; my $fullfile = "$dir/$file";
my $found_it = 0; my $found_it = 0;
my $dangling_sym = 0; my $dangling_sym = 0;

79
automake-testsuite.changes
View File

@ -1,3 +1,82 @@
-------------------------------------------------------------------
Wed Mar 21 11:26:53 CET 2018 - pth@suse.de
- Update to 1.16.1. Changes since 1.15.1:
- 'install-sh' now ensures that nobody can cross privilege boundaries by
pre-creating symlink on the directory inside "/tmp".
- 'automake' does not depend on the 'none' subroutine of the List::Util
module anymore to support older Perl version. (automake bug#30631)
- A regression in AM_PYTHON_PATH causing the rejection of non literal
minimum version parameter hasn't been fixed. (automake bug#30616)
* Miscellaneous changes
- When subdir-objects is in effect, Automake will now construct
shorter object file names when no programs and libraries name
clashes are encountered. This should make the discouraged use of
'foo_SHORTNAME' unnecessary in many cases.
* Bugs fixed:
- Automatic dependency tracking has been fixed to work also when the
'subdir-object' option is used and some 'foo_SOURCES' definition
contains unexpanded references to make variables, as in, e.g.:
a_src = sources/libs/aaa
b_src = sources/bbb
foo_SOURCES = $(a_src)/bar.c $(b_src)/baz.c
With such a setup, the created makefile fragment containing dependency
tracking information will be correctly placed under the directories
named 'sources/libs/aaa/.deps' and 'sources/bbb/.deps', rather than
mistakenly under directories named (literally!) '$(src_a)/.deps' and
'$(src_b)/.deps' (this was the first part of automake bug#13928).
Notice that in order to fix this bug we had to slightly change the
semantics of how config.status bootstraps the makefile fragments
required for the dependency tracking to work: rather than attempting
to parse the Makefiles via grep and sed trickeries only, we actually
invoke 'make' on a slightly preprocessed version of those Makefiles,
using a private target that is only meant to bootstrap the required
makefile fragments.
- The 'subdir-object' option no longer causes object files corresponding
to source files specified with an explicit '$(srcdir)' component to be
placed in the source tree rather than in the build tree.
For example, if Makefile.am contains:
AUTOMAKE_OPTIONS = subdir-objects
foo_SOURCES = $(srcdir)/foo.c $(srcdir)/s/bar.c $(top_srcdir)/baz.c
then "make all" will create 'foo.o' and 's/bar.o' in $(builddir) rather
than in $(srcdir), and will create 'baz.o' in $(top_builddir) rather
than in $(top_srcdir).
This was the second part of automake bug#13928.
- Installed 'aclocal' m4 macros can now accept installation directories
containing '@' characters (automake bug#20903)
- "./configure && make dist" no longer fails when a distributed file depends
on one from BUILT_SOURCES.
- When combining AC_LIBOBJ or AC_FUNC_ALLOCA with the
"--disable-dependency-tracking" configure option in an out of source
build, the build sub-directory defined by AC_CONFIG_LIBOBJ_DIR is now
properly created. (automake bug#27781)
- The time printed by 'mdate-sh' is now using the UTC time zone to support
the reproducible build effort. (automake bug#20314)
- The elisp byte-compilation rule now uses byte-compile-dest-file-function,
rather than byte-compile-dest-file, which was obsoleted in 2009. We expect
that Emacs-26 will continue to support the old function, but will complain
loudly, and that Emacs-27 will remove support for it altogether.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 4 23:06:25 UTC 2018 - mail@bernhard-voelker.de Sun Feb 4 23:06:25 UTC 2018 - mail@bernhard-voelker.de

4
automake-testsuite.spec
View File

@ -21,7 +21,7 @@
# aren't updated. # aren't updated.
Name: automake-testsuite Name: automake-testsuite
Version: 1.15.1 Version: 1.16.1
Release: 0 Release: 0
Summary: A Program for Automatically Generating GNU-Style Makefile.in Files Summary: A Program for Automatically Generating GNU-Style Makefile.in Files
License: GPL-2.0+ License: GPL-2.0+
@ -66,7 +66,7 @@ definitions (with rules occasionally thrown in). The generated
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch5 -p1 %patch5 -p1
%patch100 -p1 %patch100
%build %build
sh bootstrap sh bootstrap

79
automake.changes
View File

@ -1,3 +1,82 @@
-------------------------------------------------------------------
Wed Mar 21 11:26:53 CET 2018 - pth@suse.de
- Update to 1.16.1. Changes since 1.15.1:
- 'install-sh' now ensures that nobody can cross privilege boundaries by
pre-creating symlink on the directory inside "/tmp".
- 'automake' does not depend on the 'none' subroutine of the List::Util
module anymore to support older Perl version. (automake bug#30631)
- A regression in AM_PYTHON_PATH causing the rejection of non literal
minimum version parameter hasn't been fixed. (automake bug#30616)
* Miscellaneous changes
- When subdir-objects is in effect, Automake will now construct
shorter object file names when no programs and libraries name
clashes are encountered. This should make the discouraged use of
'foo_SHORTNAME' unnecessary in many cases.
* Bugs fixed:
- Automatic dependency tracking has been fixed to work also when the
'subdir-object' option is used and some 'foo_SOURCES' definition
contains unexpanded references to make variables, as in, e.g.:
a_src = sources/libs/aaa
b_src = sources/bbb
foo_SOURCES = $(a_src)/bar.c $(b_src)/baz.c
With such a setup, the created makefile fragment containing dependency
tracking information will be correctly placed under the directories
named 'sources/libs/aaa/.deps' and 'sources/bbb/.deps', rather than
mistakenly under directories named (literally!) '$(src_a)/.deps' and
'$(src_b)/.deps' (this was the first part of automake bug#13928).
Notice that in order to fix this bug we had to slightly change the
semantics of how config.status bootstraps the makefile fragments
required for the dependency tracking to work: rather than attempting
to parse the Makefiles via grep and sed trickeries only, we actually
invoke 'make' on a slightly preprocessed version of those Makefiles,
using a private target that is only meant to bootstrap the required
makefile fragments.
- The 'subdir-object' option no longer causes object files corresponding
to source files specified with an explicit '$(srcdir)' component to be
placed in the source tree rather than in the build tree.
For example, if Makefile.am contains:
AUTOMAKE_OPTIONS = subdir-objects
foo_SOURCES = $(srcdir)/foo.c $(srcdir)/s/bar.c $(top_srcdir)/baz.c
then "make all" will create 'foo.o' and 's/bar.o' in $(builddir) rather
than in $(srcdir), and will create 'baz.o' in $(top_builddir) rather
than in $(top_srcdir).
This was the second part of automake bug#13928.
- Installed 'aclocal' m4 macros can now accept installation directories
containing '@' characters (automake bug#20903)
- "./configure && make dist" no longer fails when a distributed file depends
on one from BUILT_SOURCES.
- When combining AC_LIBOBJ or AC_FUNC_ALLOCA with the
"--disable-dependency-tracking" configure option in an out of source
build, the build sub-directory defined by AC_CONFIG_LIBOBJ_DIR is now
properly created. (automake bug#27781)
- The time printed by 'mdate-sh' is now using the UTC time zone to support
the reproducible build effort. (automake bug#20314)
- The elisp byte-compilation rule now uses byte-compile-dest-file-function,
rather than byte-compile-dest-file, which was obsoleted in 2009. We expect
that Emacs-26 will continue to support the old function, but will complain
loudly, and that Emacs-27 will remove support for it altogether.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 4 23:06:25 UTC 2018 - mail@bernhard-voelker.de Sun Feb 4 23:06:25 UTC 2018 - mail@bernhard-voelker.de

4
automake.spec
View File

@ -21,7 +21,7 @@
# aren't updated. # aren't updated.
Name: automake Name: automake
Version: 1.15.1 Version: 1.16.1
Release: 0 Release: 0
Summary: A Program for Automatically Generating GNU-Style Makefile.in Files Summary: A Program for Automatically Generating GNU-Style Makefile.in Files
License: GPL-2.0+ License: GPL-2.0+
@ -66,7 +66,7 @@ definitions (with rules occasionally thrown in). The generated
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch5 -p1 %patch5 -p1
%patch100 -p1 %patch100
%build %build
sh bootstrap sh bootstrap