pool/automake
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update to 1.16.5:

Browse Source 
- PYTHON_PREFIX and PYTHON_EXEC_PREFIX are now set according to
    Python's sys.* values only if the new configure option
    --with-python-sys-prefix is specified. Otherwise, GNU default values
    are used, as in the past. (The change in 1.16.3 was too incompatible.)
  - consistently depend on install-libLTLIBRARIES.
  - use const for yyerror declaration in bison/yacc tests.
  - Common top-level files can be provided as .md; the non-md version is
    used if both are present:
      AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS
  - CTAGS, ETAGS, SCOPE variables can be set via configure.
  - Silent make output for custom link commands.
  - New option "no-dist-built-sources" skips generating $(BUILT_SOURCES)
    before building the tarball as part of "make dist", that is,
    omits the dependency of $(distdir): $(BUILT_SOURCES).
  - automake output more reproducible.
  - test-driver less likely to clash with tests writing to the same file.
  - DejaGnu tests always use the directory name, testsuite/, for
    compatibility with the newer dejagnu-1.6.3 and with prior versions.
  - config.sub and config.guess updates include restoration of `...`
    for maximum portability.
- refresh automake-suse-vendor.patch
- drop fix-testsuite-failures-with-autoconf270.patch (upstream)
- drop automake-reproducible.patch (upstream)

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=90
This commit is contained in:
Dirk Mueller 2021-11-24 14:36:42 +00:00 committed by Git OBS Bridge
parent a6b5af6b2d
commit 8d95a42bee
11 changed files with 444 additions and 684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
automake-1.16.3.tar.xz
View File

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

16
automake-1.16.3.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAl+18AEACgkQf9n8ywAL
7u5g3w//X3DAHyoXHHrUfJ0H2M37mr/aGdAOHXcLvLEX3e3Ke28Stc+gwJXGlLJe
VcM3sdv7/t66hx8BB4QaQjP76zmsBDCgBzdyWOPUX5NMCun+9GkjgPjSxd8udncJ
qShW6S9FSTczry1Jo4+moysL8Lv+UzUOwdoJlLJCjhFl3ek4hLWXrKAqvS5s+InH
ExFPQzjcSG+SBHg0T57fVNpmk7Aw/2RB9jt2PHjTgv0KjMeFe9UDTBYFF0UY8kNT
4Fol5YFPLKWp0bh8BC2fSt3U6ppvv9sbXb+ePkPdEixqR4g5lv2W9kfLibtwU/Tn
EY5v624NYjIV1udHIFNsqup07evnd29zsSEd+x8+yZIS2FNe26Y5pznd8KuM5EoO
Dt4XUiHq11lQUcdx9Y1N+r7aXLncv+v8zb0G1by4/1sXzNLH3WXTCCAc2l1iSYus
MtrlJ+hjR7hNS8NR6aUCqScgOCZMhQ7AmbF8sqoTqLtr26pvI39EAXu2LaeaCqTj
BRuchHuhOnpNMCf4KQAkYOwTEen0JqEXDNwwswQpGOXYx050U1InubVGsseVYvnO
k8vL8yB0cx+07doObAIeySJ511GrOgVJzP89r1K3nU2Y9P2Xd3EI9H54m8Pylv48
iuDefSXOSnktcAdx6Qn5IBuqYP3EySTj5J+Tbu8BmsxuxuFa8dY=
=BGqq
-----END PGP SIGNATURE-----

BIN
automake-1.16.5.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmFac7IACgkQf9n8ywAL
7u7TGw/8CdJWZAdWeg8tqnthdtz4BIVr0JcqWWtv7eyYc0G66u9OaAUnGGlRLh+V
Uhign3A/HsJQkwUqEw7V1N/RBT8HtB1eDXu3H/E4XPZE7nuxlmBfy2gO4TLUmWRd
SSS8L/AEy0kWcYOGUJuk9xS+sAeDMPor2erHxx/Yo6S9tLyNpPK/rPas5Q/ZqAJf
EI9vMtaw9qedW16LkOqvrQ8U6VHOWgSS0xRgUNj8u2yG2TpNqEbyqS94fiNFtoQx
5BWzhXcunDV85LzGuqYiBkmDBLd2Ldr1WhCHh7iA/LoD8xqoLnvLQfcb8cwpHpKx
PIqGgSIcaRwcbf4dQwNWPV5d3NXyU1vE9FzooVrhyjv6uWwT4SK2jYHaNUlP34fX
RtpkAk+G79HLJCZyWjjLhVAlTxoMH+4RnzMjbzotpZp80WhQW0/mM23Hl14uEpuf
bGNiFBHx8JEbb4vCQZrudRDMPA76GTYaZRMsRIDmta7g/JURf6roOKDOWs4gPMM5
JspOopPPyvUDt5jQRkOj1Q/nyAsrF5lCuC3RrkgQwBb4ZQ9cyLTPC5dHirV/DI4a
erM+mfDiH4coTaZ/ML4jtUvVXJreioMEMoW6KJvo09X09bEhv/0JUa/jmo9N+hoc
9T848ej8oGIswE5gG/qFVRA2I/as7oQcCEqRILf0sH0RYm5HEdk=
=lQXz
-----END PGP SIGNATURE-----

56
automake-reproducible.patch
View File

@ -1,56 +0,0 @@
--- automake-1.16.3/bin/automake.in
+++ automake-1.16.3/bin/automake.in
@@ -2388,7 +2388,7 @@
$var->requires_variables ("\@${lt}LIBOBJS\@ used", $lt . 'LIBOBJS')
if ! keys %libsources;
- foreach my $iter (keys %libsources)
+ foreach my $iter (sort keys %libsources)
{
my $dir = '';
if ($iter =~ /^(.*)(\.[cly])$/)
@@ -4692,7 +4692,7 @@
DIST_CLEAN, [],
MAINTAINER_CLEAN, []);
- foreach my $file (keys %clean_files)
+ foreach my $file (sort keys %clean_files)
{
my $when = $clean_files{$file};
prog_error 'invalid entry in %clean_files'
@@ -4762,7 +4762,7 @@
. "not 'install-hook'");
# Install the -local hooks.
- foreach (keys %dependencies)
+ foreach (sort keys %dependencies)
{
# Hooks are installed on the -am targets.
s/-am$// or next;
@@ -4784,7 +4784,7 @@
}
# All the required targets are phony.
- depend ('.PHONY', keys %required_targets);
+ depend ('.PHONY', sort keys %required_targets);
# Actually output gathered targets.
foreach (sort target_cmp keys %dependencies)
@@ -5260,7 +5260,7 @@
# has a precise meaning for AC_CONFIG_FILES and so on.
$traces .= join (' ',
map { "--trace=$_" . ':\$f:\$l::\$d::\$n::\${::}%' }
- (keys %traced));
+ (sort keys %traced));
verb "running WARNINGS=$ENV{WARNINGS} $traces";
my $tracefh = new Automake::XFile ("$traces $filename |");
@@ -5831,7 +5831,7 @@
{
my ($self) = @_;
- foreach my $prog (keys %known_programs)
+ foreach my $prog (sort keys %known_programs)
{
lang_vala_finish_target ($self, $prog);
}

8
automake-require_file.patch
View File

@ -2,11 +2,11 @@
bin/automake.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: automake-1.16.3/bin/automake.in
Index: automake-1.16.5/bin/automake.in
===================================================================
--- automake-1.16.3.orig/bin/automake.in
+++ automake-1.16.3/bin/automake.in
@@ -7569,12 +7569,14 @@ sub required_file_check_or_copy
--- automake-1.16.5.orig/bin/automake.in
+++ automake-1.16.5/bin/automake.in
@@ -7617,12 +7617,14 @@ sub required_file_check_or_copy
my $fullfile = "$dir/$file";
my $found_it = 0;
my $dangling_sym = 0;

829
automake-suse-vendor.patch
View File

@ -1,6 +1,8 @@
--- automake-1.16.3/lib/config.guess
+++ automake-1.16.3/lib/config.guess
@@ -162,6 +162,17 @@
Index: automake-1.16.5/lib/config.guess
===================================================================
--- automake-1.16.5.orig/lib/config.guess
+++ automake-1.16.5/lib/config.guess
@@ -188,6 +188,17 @@ Linux|GNU|GNU/*)
;;
esac
@ -17,618 +19,503 @@
+
# Note: order is significant - the case branches are not exclusive.
case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
@@ -244,42 +255,42 @@
exit ;;
case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
@@ -269,46 +280,46 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME
;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//')
- echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE_ARCH"-${VENDOR}-bitrig"$UNAME_RELEASE"
exit ;;
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-bitrig$UNAME_RELEASE
;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//')
- echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE_ARCH"-${VENDOR}-openbsd"$UNAME_RELEASE"
exit ;;
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-openbsd$UNAME_RELEASE
;;
*:SecBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
- GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-secbsd$UNAME_RELEASE
;;
*:LibertyBSD:*:*)
UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//')
- echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE_ARCH"-${VENDOR}-libertybsd"$UNAME_RELEASE"
exit ;;
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
- GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-libertybsd$UNAME_RELEASE
;;
*:MidnightBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE"-${VENDOR}-midnightbsd"$UNAME_RELEASE"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE-${VENDOR}-midnightbsd$UNAME_RELEASE
;;
*:ekkoBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE"-${VENDOR}-ekkobsd"$UNAME_RELEASE"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE-${VENDOR}-ekkobsd$UNAME_RELEASE
;;
*:SolidBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE"-${VENDOR}-solidbsd"$UNAME_RELEASE"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE-${VENDOR}-solidbsd$UNAME_RELEASE
;;
*:OS108:*:*)
- echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE"-${VENDOR}-os108_"$UNAME_RELEASE"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE-${VENDOR}-os108_$UNAME_RELEASE
;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+ echo powerpc-${VENDOR}-mirbsd"$UNAME_RELEASE"
exit ;;
- GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
+ GUESS=powerpc-${VENDOR}-mirbsd$UNAME_RELEASE
;;
*:MirBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE"-${VENDOR}-mirbsd"$UNAME_RELEASE"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE-${VENDOR}-mirbsd$UNAME_RELEASE
;;
*:Sortix:*:*)
- echo "$UNAME_MACHINE"-unknown-sortix
+ echo "$UNAME_MACHINE"-${VENDOR}-sortix
exit ;;
- GUESS=$UNAME_MACHINE-unknown-sortix
+ GUESS=$UNAME_MACHINE-${VENDOR}-sortix
;;
*:Twizzler:*:*)
- echo "$UNAME_MACHINE"-unknown-twizzler
+ echo "$UNAME_MACHINE"-${VENDOR}-twizzler
exit ;;
- GUESS=$UNAME_MACHINE-unknown-twizzler
+ GUESS=$UNAME_MACHINE-${VENDOR}-twizzler
;;
*:Redox:*:*)
- echo "$UNAME_MACHINE"-unknown-redox
+ echo "$UNAME_MACHINE"-${VENDOR}-redox
exit ;;
- GUESS=$UNAME_MACHINE-unknown-redox
+ GUESS=$UNAME_MACHINE-${VENDOR}-redox
;;
mips:OSF1:*.*)
echo mips-dec-osf1
@@ -341,13 +352,13 @@
trap '' 0
exit $exitcode ;;
GUESS=mips-dec-osf1
@@ -370,13 +381,13 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME
GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
+ echo m68k-${VENDOR}-sysv4
exit ;;
- GUESS=m68k-unknown-sysv4
+ GUESS=m68k-${VENDOR}-sysv4
;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo "$UNAME_MACHINE"-unknown-amigaos
+ echo "$UNAME_MACHINE"-${VENDOR}-amigaos
exit ;;
- GUESS=$UNAME_MACHINE-unknown-amigaos
+ GUESS=$UNAME_MACHINE-${VENDOR}-amigaos
;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo "$UNAME_MACHINE"-unknown-morphos
+ echo "$UNAME_MACHINE"-${VENDOR}-morphos
exit ;;
- GUESS=$UNAME_MACHINE-unknown-morphos
+ GUESS=$UNAME_MACHINE-${VENDOR}-morphos
;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -362,7 +373,7 @@
echo arm-acorn-riscix"$UNAME_RELEASE"
exit ;;
GUESS=i370-ibm-openedition
@@ -391,7 +402,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME
GUESS=arm-acorn-riscix$UNAME_RELEASE
;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos
+ echo arm-${VENDOR}-riscos
exit ;;
- GUESS=arm-unknown-riscos
+ GUESS=arm-${VENDOR}-riscos
;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
@@ -395,7 +406,7 @@
echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
exit ;;
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux"$UNAME_RELEASE"
+ echo i386-${VENDOR}-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
set_cc_for_build
@@ -411,7 +422,7 @@
SUN_ARCH=x86_64
fi
fi
- echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
+ echo "$SUN_ARCH"-${VENDOR}-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -470,7 +481,7 @@
echo m68k-hades-mint"$UNAME_RELEASE"
exit ;;
GUESS=hppa1.1-hitachi-hiuxmpp
@@ -505,7 +516,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME
GUESS=m68k-hades-mint$UNAME_RELEASE
;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint"$UNAME_RELEASE"
+ echo m68k-${VENDOR}-mint"$UNAME_RELEASE"
exit ;;
- GUESS=m68k-unknown-mint$UNAME_RELEASE
+ GUESS=m68k-${VENDOR}-mint$UNAME_RELEASE
;;
m68k:machten:*:*)
echo m68k-apple-machten"$UNAME_RELEASE"
@@ -782,9 +793,9 @@
exit ;;
GUESS=m68k-apple-machten$UNAME_RELEASE
@@ -818,9 +829,9 @@ EOF
;;
i*86:OSF1:*:*)
if test -x /usr/sbin/sysversion ; then
- echo "$UNAME_MACHINE"-unknown-osf1mk
+ echo "$UNAME_MACHINE"-${VENDOR}-osf1mk
- GUESS=$UNAME_MACHINE-unknown-osf1mk
+ GUESS=$UNAME_MACHINE-${VENDOR}-osf1mk
else
- echo "$UNAME_MACHINE"-unknown-osf1
+ echo "$UNAME_MACHINE"-${VENDOR}-osf1
- GUESS=$UNAME_MACHINE-unknown-osf1
+ GUESS=$UNAME_MACHINE-${VENDOR}-osf1
fi
exit ;;
;;
parisc*:Lites*:*:*)
@@ -841,13 +852,13 @@
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE"-${VENDOR}-bsdi"$UNAME_RELEASE"
exit ;;
@@ -885,10 +896,10 @@ EOF
GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi"$UNAME_RELEASE"
+ echo sparc-${VENDOR}-bsdi"$UNAME_RELEASE"
exit ;;
- GUESS=sparc-unknown-bsdi$UNAME_RELEASE
+ GUESS=sparc-${VENDOR}-bsdi$UNAME_RELEASE
;;
*:BSD/OS:*:*)
- echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE"-${VENDOR}-bsdi"$UNAME_RELEASE"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE-${VENDOR}-bsdi$UNAME_RELEASE
;;
arm:FreeBSD:*:*)
UNAME_PROCESSOR=$(uname -p)
@@ -855,9 +866,9 @@
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
UNAME_PROCESSOR=`uname -p`
@@ -897,10 +908,10 @@ EOF
| grep -q __ARM_PCS_VFP
then
- echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi
+ echo "${UNAME_PROCESSOR}"-${VENDOR}-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi
FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
- GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
+ GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL-gnueabi
else
- echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf
+ echo "${UNAME_PROCESSOR}"-${VENDOR}-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf
FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
- GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
+ GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL-gnueabihf
fi
exit ;;
;;
*:FreeBSD:*:*)
@@ -868,61 +879,61 @@
i386)
@@ -912,7 +923,7 @@ EOF
UNAME_PROCESSOR=i586 ;;
esac
- echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
+ echo "$UNAME_PROCESSOR"-${VENDOR}-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
exit ;;
FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
- GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
+ GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL
;;
i*:CYGWIN*:*)
- echo "$UNAME_MACHINE"-pc-cygwin
+ echo "$UNAME_MACHINE"-${VENDOR}-cygwin
exit ;;
*:MINGW64*:*)
- echo "$UNAME_MACHINE"-pc-mingw64
+ echo "$UNAME_MACHINE"-${VENDOR}-mingw64
exit ;;
*:MINGW*:*)
- echo "$UNAME_MACHINE"-pc-mingw32
+ echo "$UNAME_MACHINE"-${VENDOR}-mingw32
exit ;;
*:MSYS*:*)
- echo "$UNAME_MACHINE"-pc-msys
+ echo "$UNAME_MACHINE"-${VENDOR}-msys
exit ;;
i*:PW*:*)
- echo "$UNAME_MACHINE"-pc-pw32
+ echo "$UNAME_MACHINE"-${VENDOR}-pw32
exit ;;
*:Interix*:*)
case "$UNAME_MACHINE" in
x86)
- echo i586-pc-interix"$UNAME_RELEASE"
+ echo i586-${VENDOR}-interix"$UNAME_RELEASE"
exit ;;
GUESS=$UNAME_MACHINE-pc-cygwin
@@ -935,10 +946,10 @@ EOF
GUESS=i586-pc-interix$UNAME_RELEASE
;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix"$UNAME_RELEASE"
+ echo x86_64-${VENDOR}-interix"$UNAME_RELEASE"
exit ;;
- GUESS=x86_64-unknown-interix$UNAME_RELEASE
+ GUESS=x86_64-${VENDOR}-interix$UNAME_RELEASE
;;
IA64)
- echo ia64-unknown-interix"$UNAME_RELEASE"
+ echo ia64-${VENDOR}-interix"$UNAME_RELEASE"
exit ;;
- GUESS=ia64-unknown-interix$UNAME_RELEASE
+ GUESS=ia64-${VENDOR}-interix$UNAME_RELEASE
;;
esac ;;
i*:UWIN*:*)
- echo "$UNAME_MACHINE"-pc-uwin
+ echo "$UNAME_MACHINE"-${VENDOR}-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-pc-cygwin
+ echo x86_64-${VENDOR}-cygwin
exit ;;
@@ -949,29 +960,29 @@ EOF
;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
+ echo powerpcle-${VENDOR}-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
exit ;;
SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
- GUESS=powerpcle-unknown-solaris2$SUN_REL
+ GUESS=powerpcle-${VENDOR}-solaris2$SUN_REL
;;
*:GNU:*:*)
# 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,[-/].*$,,')-${VENDOR}-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')"
exit ;;
GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'`
GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
- GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+ GUESS=$GNU_ARCH-${VENDOR}-$LIBC$GNU_REL
;;
*:GNU/*:*:*)
# 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-${VENDOR}-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC"
exit ;;
GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"`
GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
- GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-$GNU_SYS$GNU_REL-$LIBC
;;
*:Minix:*:*)
- echo "$UNAME_MACHINE"-unknown-minix
+ echo "$UNAME_MACHINE"-${VENDOR}-minix
exit ;;
- GUESS=$UNAME_MACHINE-unknown-minix
+ GUESS=$UNAME_MACHINE-${VENDOR}-minix
;;
aarch64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
alpha:Linux:*:*)
case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in
@@ -936,29 +947,29 @@
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
@@ -985,29 +996,29 @@ EOF
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
arm*:Linux:*:*)
set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"eabi
- GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-${LIBC}eabi
else
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"eabihf
- GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-${LIBC}eabihf
fi
fi
exit ;;
;;
avr32*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
cris:Linux:*:*)
echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
@@ -967,28 +978,28 @@
echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
GUESS=$UNAME_MACHINE-axis-linux-$LIBC
@@ -1016,31 +1027,31 @@ EOF
GUESS=$UNAME_MACHINE-axis-linux-$LIBC
;;
e2k:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
frv:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
hexagon:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
i*86:Linux:*:*)
- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
ia64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
k1om:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
m32r*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
m68*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
mips:Linux:*:* | mips64:Linux:*:*)
set_cc_for_build
@@ -1035,60 +1046,60 @@
#endif
@@ -1088,60 +1099,60 @@ EOF
EOF
eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')"
cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
eval "$cc_set_vars"
- test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+ test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-${VENDOR}-linux-$LIBCABI"; exit; }
;;
mips64el:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
openrisc*:Linux:*:*)
- echo or1k-unknown-linux-"$LIBC"
+ echo or1k-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=or1k-unknown-linux-$LIBC
+ GUESS=or1k-${VENDOR}-linux-$LIBC
;;
or32:Linux:*:* | or1k*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
padre:Linux:*:*)
- echo sparc-unknown-linux-"$LIBC"
+ echo sparc-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=sparc-unknown-linux-$LIBC
+ GUESS=sparc-${VENDOR}-linux-$LIBC
;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-"$LIBC"
+ echo hppa64-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=hppa64-unknown-linux-$LIBC
+ GUESS=hppa64-${VENDOR}-linux-$LIBC
;;
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-"$LIBC" ;;
- PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
- *) echo hppa-unknown-linux-"$LIBC" ;;
+ PA7*) echo hppa1.1-${VENDOR}-linux-"$LIBC" ;;
+ PA8*) echo hppa2.0-${VENDOR}-linux-"$LIBC" ;;
+ *) echo hppa-${VENDOR}-linux-"$LIBC" ;;
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
- PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
- *) GUESS=hppa-unknown-linux-$LIBC ;;
+ PA7*) GUESS=hppa1.1-${VENDOR}-linux-$LIBC ;;
+ PA8*) GUESS=hppa2.0-${VENDOR}-linux-$LIBC ;;
+ *) GUESS=hppa-${VENDOR}-linux-$LIBC ;;
esac
exit ;;
;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-"$LIBC"
+ echo powerpc64-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=powerpc64-unknown-linux-$LIBC
+ GUESS=powerpc64-${VENDOR}-linux-$LIBC
;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-"$LIBC"
+ echo powerpc-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=powerpc-unknown-linux-$LIBC
+ GUESS=powerpc-${VENDOR}-linux-$LIBC
;;
ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-"$LIBC"
+ echo powerpc64le-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=powerpc64le-unknown-linux-$LIBC
+ GUESS=powerpc64le-${VENDOR}-linux-$LIBC
;;
ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-"$LIBC"
+ echo powerpcle-${VENDOR}-linux-"$LIBC"
exit ;;
riscv32:Linux:*:* | riscv64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=powerpcle-unknown-linux-$LIBC
+ GUESS=powerpcle-${VENDOR}-linux-$LIBC
;;
riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
s390:Linux:*:* | s390x:Linux:*:*)
echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
exit ;;
GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
;;
sh64*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
sh*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
tile*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
vax:Linux:*:*)
echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
@@ -1104,10 +1115,10 @@
LIBCABI="$LIBC"x32
GUESS=$UNAME_MACHINE-dec-linux-$LIBC
@@ -1157,10 +1168,10 @@ EOF
LIBCABI=${LIBC}x32
fi
fi
- echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBCABI"
exit ;;
- GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBCABI
;;
xtensa*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1121,34 +1132,34 @@
# I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
- echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+ echo "$UNAME_MACHINE"-${VENDOR}-sysv4.2uw"$UNAME_VERSION"
exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
- echo "$UNAME_MACHINE"-pc-os2-emx
+ echo "$UNAME_MACHINE"-${VENDOR}-os2-emx
exit ;;
@@ -1182,16 +1193,16 @@ EOF
GUESS=$UNAME_MACHINE-pc-os2-emx
;;
i*86:XTS-300:*:STOP)
- echo "$UNAME_MACHINE"-unknown-stop
+ echo "$UNAME_MACHINE"-${VENDOR}-stop
exit ;;
- GUESS=$UNAME_MACHINE-unknown-stop
+ GUESS=$UNAME_MACHINE-${VENDOR}-stop
;;
i*86:atheos:*:*)
- echo "$UNAME_MACHINE"-unknown-atheos
+ echo "$UNAME_MACHINE"-${VENDOR}-atheos
exit ;;
- GUESS=$UNAME_MACHINE-unknown-atheos
+ GUESS=$UNAME_MACHINE-${VENDOR}-atheos
;;
i*86:syllable:*:*)
- echo "$UNAME_MACHINE"-pc-syllable
+ echo "$UNAME_MACHINE"-${VENDOR}-syllable
exit ;;
GUESS=$UNAME_MACHINE-pc-syllable
;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos"$UNAME_RELEASE"
+ echo i386-${VENDOR}-lynxos"$UNAME_RELEASE"
exit ;;
- GUESS=i386-unknown-lynxos$UNAME_RELEASE
+ GUESS=i386-${VENDOR}-lynxos$UNAME_RELEASE
;;
i*86:*DOS:*:*)
- echo "$UNAME_MACHINE"-pc-msdosdjgpp
+ echo "$UNAME_MACHINE"-${VENDOR}-msdosdjgpp
exit ;;
i*86:*:4.*:*)
UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//')
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
else
- echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+ echo "$UNAME_MACHINE"-${VENDOR}-sysv"$UNAME_REL"
fi
exit ;;
i*86:*:5:[678]*)
@@ -1158,12 +1169,12 @@
GUESS=$UNAME_MACHINE-pc-msdosdjgpp
@@ -1211,7 +1222,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 ;;
- GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ GUESS=$UNAME_MACHINE-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=$(sed -n 's/.*Version //p' </usr/options/cb.name)
- echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+ echo "$UNAME_MACHINE"-${VENDOR}-isc"$UNAME_REL"
elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //'))
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1173,9 +1184,9 @@
&& UNAME_MACHINE=i686
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
- echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+ echo "$UNAME_MACHINE"-${VENDOR}-sco"$UNAME_REL"
else
- echo "$UNAME_MACHINE"-pc-sysv32
+ echo "$UNAME_MACHINE"-${VENDOR}-sysv32
fi
exit ;;
pc:*:*:*)
@@ -1185,10 +1196,10 @@
# Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build.
- echo i586-pc-msdosdjgpp
+ echo i586-${VENDOR}-msdosdjgpp
exit ;;
Intel:Mach:3*:*)
- echo i386-pc-mach3
+ echo i386-${VENDOR}-mach3
exit ;;
paragon:*:*:*)
echo i860-intel-osf1
@@ -1197,7 +1208,7 @@
@@ -1250,7 +1261,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
GUESS=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
- GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4
+ GUESS=i860-${VENDOR}-sysv$UNAME_RELEASE # Unknown i860-SVR4
fi
exit ;;
;;
mini*:CTIX:SYS*5:*)
@@ -1234,19 +1245,19 @@
@@ -1287,19 +1298,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 ;;
- GUESS=m68k-unknown-lynxos$UNAME_RELEASE
+ GUESS=m68k-${VENDOR}-lynxos$UNAME_RELEASE
;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
GUESS=m68k-atari-sysv4
;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos"$UNAME_RELEASE"
+ echo sparc-${VENDOR}-lynxos"$UNAME_RELEASE"
exit ;;
- GUESS=sparc-unknown-lynxos$UNAME_RELEASE
+ GUESS=sparc-${VENDOR}-lynxos$UNAME_RELEASE
;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+ echo rs6000-${VENDOR}-lynxos"$UNAME_RELEASE"
exit ;;
- GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
+ GUESS=rs6000-${VENDOR}-lynxos$UNAME_RELEASE
;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+ echo powerpc-${VENDOR}-lynxos"$UNAME_RELEASE"
exit ;;
- GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
+ GUESS=powerpc-${VENDOR}-lynxos$UNAME_RELEASE
;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv"$UNAME_RELEASE"
@@ -1296,7 +1307,7 @@
GUESS=mips-dde-sysv$UNAME_RELEASE
@@ -1349,7 +1360,7 @@ EOF
if test -d /usr/nec; then
echo mips-nec-sysv"$UNAME_RELEASE"
GUESS=mips-nec-sysv$UNAME_RELEASE
else
- echo mips-unknown-sysv"$UNAME_RELEASE"
+ echo mips-${VENDOR}-sysv"$UNAME_RELEASE"
- GUESS=mips-unknown-sysv$UNAME_RELEASE
+ GUESS=mips-${VENDOR}-sysv$UNAME_RELEASE
fi
exit ;;
;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1306,13 +1317,13 @@
echo powerpc-apple-beos
exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
+ echo i586-${VENDOR}-beos
exit ;;
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
- echo i586-pc-haiku
+ echo i586-${VENDOR}-haiku
exit ;;
@@ -1365,7 +1376,7 @@ EOF
GUESS=i586-pc-haiku
;;
x86_64:Haiku:*:*)
- echo x86_64-unknown-haiku
+ echo x86_64-${VENDOR}-haiku
exit ;;
- GUESS=x86_64-unknown-haiku
+ GUESS=x86_64-${VENDOR}-haiku
;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux"$UNAME_RELEASE"
@@ -1390,7 +1401,7 @@
echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
exit ;;
*:QNX:*:4*)
- echo i386-pc-qnx
+ echo i386-${VENDOR}-qnx
exit ;;
NEO-*:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk"$UNAME_RELEASE"
@@ -1426,13 +1437,13 @@
else
UNAME_MACHINE="$cputype"
GUESS=sx4-nec-superux$UNAME_RELEASE
@@ -1478,13 +1489,13 @@ EOF
elif test "x${cputype-}" != x; then
UNAME_MACHINE=$cputype
fi
- echo "$UNAME_MACHINE"-unknown-plan9
+ echo "$UNAME_MACHINE"-${VENDOR}-plan9
exit ;;
- GUESS=$UNAME_MACHINE-unknown-plan9
+ GUESS=$UNAME_MACHINE-${VENDOR}-plan9
;;
*:TOPS-10:*:*)
- echo pdp10-unknown-tops10
+ echo pdp10-${VENDOR}-tops10
exit ;;
- GUESS=pdp10-unknown-tops10
+ GUESS=pdp10-${VENDOR}-tops10
;;
*:TENEX:*:*)
- echo pdp10-unknown-tenex
+ echo pdp10-${VENDOR}-tenex
exit ;;
- GUESS=pdp10-unknown-tenex
+ GUESS=pdp10-${VENDOR}-tenex
;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
@@ -1441,16 +1452,16 @@
echo pdp10-xkl-tops20
exit ;;
GUESS=pdp10-dec-tops20
@@ -1493,17 +1504,17 @@ EOF
GUESS=pdp10-xkl-tops20
;;
*:TOPS-20:*:*)
- echo pdp10-unknown-tops20
+ echo pdp10-${VENDOR}-tops20
exit ;;
- GUESS=pdp10-unknown-tops20
+ GUESS=pdp10-${VENDOR}-tops20
;;
*:ITS:*:*)
- echo pdp10-unknown-its
+ echo pdp10-${VENDOR}-its
exit ;;
- GUESS=pdp10-unknown-its
+ GUESS=pdp10-${VENDOR}-its
;;
SEI:*:*:SEIUX)
echo mips-sei-seiux"$UNAME_RELEASE"
exit ;;
GUESS=mips-sei-seiux$UNAME_RELEASE
;;
*:DragonFly:*:*)
- echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
+ echo "$UNAME_MACHINE"-${VENDOR}-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
exit ;;
DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
- GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
+ GUESS=$UNAME_MACHINE-${VENDOR}-dragonfly$DRAGONFLY_REL
;;
*:*VMS:*:*)
UNAME_MACHINE=$( (uname -p) 2>/dev/null)
@@ -1460,25 +1471,25 @@
V*) echo vax-dec-vms ; exit ;;
esac ;;
*:XENIX:*:SysV)
- echo i386-pc-xenix
+ echo i386-${VENDOR}-xenix
exit ;;
i*86:skyos:*:*)
- echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')"
+ echo "$UNAME_MACHINE"-${VENDOR}-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')"
exit ;;
i*86:rdos:*:*)
- echo "$UNAME_MACHINE"-pc-rdos
+ echo "$UNAME_MACHINE"-${VENDOR}-rdos
exit ;;
i*86:AROS:*:*)
- echo "$UNAME_MACHINE"-pc-aros
+ echo "$UNAME_MACHINE"-${VENDOR}-aros
exit ;;
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1523,16 +1534,16 @@ EOF
GUESS=$UNAME_MACHINE-pc-rdos
;;
*:AROS:*:*)
- GUESS=$UNAME_MACHINE-unknown-aros
+ GUESS=$UNAME_MACHINE-${VENDOR}-aros
;;
x86_64:VMkernel:*:*)
- echo "$UNAME_MACHINE"-unknown-esx
+ echo "$UNAME_MACHINE"-${VENDOR}-esx
exit ;;
- GUESS=$UNAME_MACHINE-unknown-esx
+ GUESS=$UNAME_MACHINE-${VENDOR}-esx
;;
amd64:Isilon\ OneFS:*:*)
- echo x86_64-unknown-onefs
+ echo x86_64-${VENDOR}-onefs
exit ;;
- GUESS=x86_64-unknown-onefs
+ GUESS=x86_64-${VENDOR}-onefs
;;
*:Unleashed:*:*)
- echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
+ echo "$UNAME_MACHINE"-${VENDOR}-unleashed"$UNAME_RELEASE"
exit ;;
- GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+ GUESS=$UNAME_MACHINE-${VENDOR}-unleashed$UNAME_RELEASE
;;
esac

28
automake.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Sat Oct 16 12:43:08 UTC 2021 - Dirk Müller <dmueller@suse.com>
- update to 1.16.5:
- PYTHON_PREFIX and PYTHON_EXEC_PREFIX are now set according to
Python's sys.* values only if the new configure option
--with-python-sys-prefix is specified. Otherwise, GNU default values
are used, as in the past. (The change in 1.16.3 was too incompatible.)
- consistently depend on install-libLTLIBRARIES.
- use const for yyerror declaration in bison/yacc tests.
- Common top-level files can be provided as .md; the non-md version is
used if both are present:
AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS
- CTAGS, ETAGS, SCOPE variables can be set via configure.
- Silent make output for custom link commands.
- New option "no-dist-built-sources" skips generating $(BUILT_SOURCES)
before building the tarball as part of "make dist", that is,
omits the dependency of $(distdir): $(BUILT_SOURCES).
- automake output more reproducible.
- test-driver less likely to clash with tests writing to the same file.
- DejaGnu tests always use the directory name, testsuite/, for
compatibility with the newer dejagnu-1.6.3 and with prior versions.
- config.sub and config.guess updates include restoration of `...`
for maximum portability.
- refresh automake-suse-vendor.patch
- drop fix-testsuite-failures-with-autoconf270.patch (upstream)
- drop automake-reproducible.patch (upstream)
-------------------------------------------------------------------
Fri Mar 12 22:02:56 UTC 2021 - Dirk Müller <dmueller@suse.com>

55
automake.keyring
View File

@ -1,3 +1,8 @@
Member GPG keyring of automake group.
Note that this keyring is not intended for checking releases of that group.
Use Group Release Keyring instead.
GPG keys of Karl Berry <karl>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
@ -1527,18 +1532,18 @@ KaHLeCLF5ZI2vKm3HEeCTtlOg7xZEONgwzL+fdKo+D6SoC8RRxJKs8a3sVfI4t6C
nrQzvJbBn6gxdgCu5i29J1QCYrCYvql2UyFPAK+do99/1jOXT4m2836j1wARAQAB
tCBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1PokCVQQTAQgAPwIbAwYL
CQgHAwIGFQgCCQoLBBYCAwECHgECF4AWIQR+N5Kp2Kz31jO8FYjtl+kOYqp+NAUC
XyW9lwUJFK4LswAKCRDtl+kOYqp+NKNVD/9HMsI1606n0UuTXHwITsyOjAI9SDOT
+C3DUv6qlM5BH2nWAMTiIiyA5uglsJv93oi2vNtFf/Q/m/1cnZWgnVnExkyLI4EN
Sd1uBvr0/lCSdPlP0Mg6GWSpXMu+x0vdT0AaZNOTE0FnPuoldc3XD76C2qg8sX/i
axXTKHy9P+BlAq/Cs7/pxDQ0EzSn0USZ2C0l5vv4PMpA/picnS6K609JvDGaORmw
ZeXIZqQNZV+ZQs+UYtVoguDTqby3IUY1I8BlXHRptaj9AMn4Uoh/CqpQlVojoyWl
HqaFnnJBKeF0hvJ9SAyalwuzAjG7vQW07MYncaOFm0woiKbg5JLO8F4SBTIkuO0D
Cf9nLAay6VsB4rzwdEfRwjPLYAn7MR3fvHCEzfrkldTraiBO1T0ieDK80I7sLf6p
MeCYI19pUlx0/NRMGCddiFIQdfthKWXGRS5LAs8jwBf8H6G5PWinPrEIaomIP21i
vuhQD07bYq9IiIdeljjUdHcGI0i/B4M56Zaa8Ff38iniOlrDYCmYWR4dCWZiuQeZ
3OgqeQs9a6jTvgdDGVmRVqY+jzk8PlaHfcok8ROhFcHKkcfhuBhL25hlRIshRDOE
skXqKwnzrbqga3GXZXfsXAoFbzNhLdLv9A+LJAYSkXP6/5qdTpELVGosyH884Vdb
BpkGI04oYVqulYkCHAQQAQIABgUCVi604AAKCRDNVPzj2WS++xxpD/4hZPbOUfcF
YTAc/AUJHhWsGAAKCRDtl+kOYqp+NBKwD/9Qise9/wZsD8Nyl+ADOCIAFZY5qlSl
/5SyCjJIRc6cx/Z0fm4yJVH2Tf3GlSBk1uW24z8+mB2ZxFQUGjio/2iDndSqxYR4
qvPGudo4RGvdvhw6LLqTdRsAY4947xLpNUO6gDtZsRpn4isn+ViX85XfGJrIFjBm
zj70eMxEZZrz1IMfUB5I/2oNGDsXDZlCUU30RFMYChGA1ofpIHWdAs+lW2jVBfeE
Lbi2su+oUpqrx83u0eJQg3RY3jmPjw8snHS4ieXpvS0e89qziBlNCqS59qJHaf4G
XCjz+o5gap2e0NEeQYqcyCqAfqjI78KEpVJNQx5D/zSOvnNs6KuzWD7No4nb5A3p
A6KA1JAwJW0H3F2+RhTEg+kFxpcCen0jjuFBnE3TfO3RSpSGqZN0j4AkuR6h/+I7
uUfaQAAope4mso/9VBEElaHYTQmA/m4/AXb2Kt/qkt6QgUIyJtSKcMCVTbfL6iIj
rzu4EzkjtZJkbAfvU8lpkUsWX2Qwo25MwyxyzsHMUq9ccIRPEiI0hVu7jeFAql6c
ql/3KUWvSr8QCyn7KWhfxyzy6j0+2xtQ29LHAOhboawJJoZd+PtintzHSSZ6G+8T
Xn3EbjmHHlXWWfnvWyaJCuJzf1PybRgNYqL6EXCHRHCIb4S9Av8sJpJzZiskG1v5
WUkv79aHb1ol14kCHAQQAQIABgUCVi604AAKCRDNVPzj2WS++xxpD/4hZPbOUfcF
LwePuSD3tqKrcmAq0vmyND1aNSOht0OlUbnHtsWxJmThEVEF25VfPbWhD+DZjRj8
hkQNzgkdeLJXJNj8JqS/MedrVa3j3wzHAnSt6fIQ8VvLmZDYg2gCpZrlU/y15Oby
OrPkgOCC6MC2PFwHnEpAfR0d6AdbZ+ZeLqbvkB/tkMsqroNMSlPtgq8AWCKX++WJ
@ -1561,19 +1566,19 @@ FuDmiIAQf9WD/wzEfICc+F+uDDI+uYkRxUFp92ykmdhDEFg1yjYsU8iGU69aHyvh
q36z4zctvbqhRNzOWB1bVJ/dIMDvsExGcXQVDIT7sDNXv0wE3jKSKpp7NDG1oXUX
L+2+SF99Kjy753AbQSAmH617fyBNwhJWvQYg+mUvPpiGOtses9EXUI3lS4v0MEaP
G43flEs1UR+1rpFQWVHo1y1OO+sAEQEAAYkCPAQYAQgAJgIbDBYhBH43kqnYrPfW
M7wViO2X6Q5iqn40BQJfJb2zBQkUrgvPAAoJEO2X6Q5iqn40cnMP/17CgUkXT9aI
JriPM8wbceYrcl7+bdYEf79SlwSbbHN7R4CoIJFOlN9S/34typGVYvpgmCJDYFTB
xyPO92iMXDgA4+cWHzt5T1aYO9hsKhh7vDtK+6ProZGc+08gUTXHhb97hMMQhknJ
lnfjpSEC9em906FU+I93T1fTGupnBa3aWcK8jM0JaBGby2hG1S3olaDLSTtBINNB
YmvuWR9MKOhhqDrlk5cwFDJLh5NrXteEY08WAzcLzG3pkrXPHkFeMQtfqk0jLdGG
vGC3NCIkqYrdLhiRvGpru38C26REn5f4I0vGE3VfIXHe8TMCNmQut1NtMuUmpDIy
1aLxGzuptUhnOJN//r+VjDPoi3LOySNYphqe/dMubsfUr6ohP41mKF81FuwI4amq
JtrqIL2yqax3a0qlfwCxXftieqJcuekX+eCPDCKrYMXR0FYgwpG2ITZUGtrEjESl
E6Dscx734HKdr5ORIocLUUKEOGeiU6DGhGFdb5Twu0Sn+u1mUPDN0M++CdMvClIE
8klo4G91EOImu1Upb8xcOPQwxh1jwqSrU5QwoNmSYegQSHLpIUurFz1iQUh1vpPX
zKinkWEqv4IqA1ciL+LyySuLkp7MsJpVRMbWJCNWOOSbaH4oDBJ5dHMGc35x5mos
Ck90PXknuFDDsYHfDo5smf9lo6YXx7N9
=QLCc
M7wViO2X6Q5iqn40BQJhMB1RBQkeFaxtAAoJEO2X6Q5iqn40d5QP/iRm1LyrCKbM
dqgP9ShOcPH7UfFEr4SY2TDdQgE4L+QItP16RNgTxAkxaBxK95I0nletr03inRKw
sb0dIw/BH2LXbG2DjI6yKJK6UThVhWWBXYuGjSv2i6bVIzHLRY3IOQF+8dyVJ+vo
eaOtxdV1lYR1ke/Dv6pFqUGGNBsSVu/2R03uCffTA9OsRzbuV5mJrFgxVFmBAguL
N/cT5Ffh77x3LsA61Ro3hIX4399GFFBQ3h4RfMA1nNWiU0KjNy/GtW0amxn26zhq
Qvy0W0hEJRA6ts+e/4ZHwcX3U7NTnPTckbCyy71d7U8/AVHkoy7EB8ROcDbJHTJc
KlG9f6eYlPZ2aYVqBd9n1Yj4NYT1zobrQjvHQRCUAx0naKscN2es9x/rWvg4BnnB
cXRaT2a8Wy3pKzLGD61dstvUM7tnyvdBxHk7aLlbdsfZP+flP2tbHkFNZWH5myPE
lPMcQGFYyi9to+4YZU28G3rnzxmKFWkYAEMaxPZPunOZnOBHURFhgk/qs6GYSTPv
g0u/kd1JV2yOKHb8+SB/Dpk/gx9KybTUC3TtbW1b2X94ErB8LCmpMi26a3ZvyxrE
5DJx2GdUoj2QkKTSFQV7MOo1tJ9vwtSfHnpT/+E6yKtzCLl9CNiVjd57puN1BhWC
VvLwfAzUC2UvpPYh8u3maJaMAC6BgK78
=JpE/
-----END PGP PUBLIC KEY BLOCK-----
GPG keys of Zack Weinberg <zackw>

13
automake.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package automake
# spec file
#
# Copyright (c) 2021 SUSE LLC
#
@ -26,23 +26,19 @@
%define nsuffix %{nil}
%endif
Name: automake%{nsuffix}
Version: 1.16.3
Version: 1.16.5
Release: 0
Summary: A Program for Automatically Generating GNU-Style Makefile.in Files
# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
License: GPL-2.0-or-later AND GFDL-1.3-or-later AND SUSE-Public-Domain AND MIT
License: GFDL-1.3-or-later AND GPL-2.0-or-later AND SUSE-Public-Domain AND MIT
Group: Development/Tools/Building
URL: https://www.gnu.org/software/automake
Source0: https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig
Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=automake&download=1#/automake.keyring
Source3: automake-rpmlintrc
#Source4: http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
#Source5: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
Patch1: https://git.savannah.gnu.org/cgit/automake.git/patch/?id=ccb57553e3433df3e52e534e6f87915db23ff9a5#/fix-testsuite-failures-with-autoconf270.patch
Patch2: automake-require_file.patch
Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
Patch4: automake-reproducible.patch
Patch5: 0001-correct-parameter-parsing-in-test-driver-script.patch
Patch100: automake-suse-vendor.patch
BuildRequires: autoconf >= 2.69
@ -55,7 +51,7 @@ BuildRequires: perl(threads)
Requires: autoconf >= 2.69
Requires: perl
Requires(post): info
Requires(preun): info
Requires(preun):info
BuildArch: noarch
%if "%{flavor}" == "testsuite"
BuildRequires: cscope
@ -104,6 +100,7 @@ sh bootstrap
%install
%else
%install
%make_install
mkdir %{buildroot}%{_sysconfdir}

101
fix-testsuite-failures-with-autoconf270.patch
View File

@ -1,101 +0,0 @@
From ccb57553e3433df3e52e534e6f87915db23ff9a5 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Mon, 14 Dec 2020 14:50:47 -0500
Subject: Fix some build and test failures with Autoconf 2.70.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Autoconf 2.70 (released last week) makes a few changes that broke Automake’s
expectations, mostly in the test suite. This patch addresses two of the
problems:
- autoconf now issues a warning if fed a configure script that doesn’t invoke
both AC_INIT and AC_OUTPUT; this, plus a problem with system-provided
tools (still under investigation) broke the *build* on macOS; it also
causes a couple of spurious testsuite failures.
- AC_PACKAGE_NAME and AC_PACKAGE_VERSION are now defined unconditionally.
AM_INIT_AUTOMAKE needs to use m4_ifset instead of m4_ifdef to diagnose
the obsolete use of AC_INIT with fewer than two arguments. (This change
is compatible with autoconf 2.69; m4_ifset is much older, and it means
‘defined with a non-empty value’.)
* configure.ac: Use both AC_INIT and AC_OUTPUT in test configure scripts.
* t/deprecated-acinit.sh, t/init.sh: Likewise.
* m4/init.m4 (AM_INIT_AUTOMAKE): Use m4_ifset, not m4_ifdef, to detect
AC_PACKAGE_NAME and/or AC_PACKAGE_VERSION not having a value.
---
configure.ac | 9 +++++++--
m4/init.m4 | 2 +-
t/deprecated-acinit.sh | 1 +
t/init.sh | 1 +
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 45507b6f4..065317411 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,9 @@ fi
AC_CACHE_CHECK([whether autoconf works], [am_cv_autoconf_works],
[mkdir conftest
-echo 'AC''_INIT' > conftest/conftest.ac
+printf '%s\n' > conftest/conftest.ac \
+ 'AC''_INIT([smoke-test], [1])' \
+ 'AC''_OUTPUT'
if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]);
then
am_cv_autoconf_works=yes
@@ -139,7 +141,10 @@ fi
AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version],
[mkdir conftest
dnl Creative quoting required to avoid spurious expansion of AC_PREREQ macro
-echo 'AC'"_PREREQ([[$required_autoconf_version]])" > conftest/conftest.ac
+printf '%s\n' > conftest/conftest.ac \
+ 'AC'"_PREREQ([[$required_autoconf_version]])" \
+ 'AC''_INIT([smoke-test], [1])' \
+ 'AC''_OUTPUT'
if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]);
then
am_cv_autoconf_version=yes
diff --git a/m4/init.m4 b/m4/init.m4
index f82d756c2..cbe8fddf8 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -64,7 +64,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
m4_if(
- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
[ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh
index 21614bafa..f393d6534 100644
--- a/t/deprecated-acinit.sh
+++ b/t/deprecated-acinit.sh
@@ -35,6 +35,7 @@ for ac_init in AC_INIT 'AC_INIT([Makefile.am])'; do
$ac_init
$am_init_automake
AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
END
cat configure.ac # For debugging.
$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
diff --git a/t/init.sh b/t/init.sh
index c6f6d6461..df138a040 100644
--- a/t/init.sh
+++ b/t/init.sh
@@ -25,6 +25,7 @@ for ac_init_args in '' '([x])'; do
unindent >configure.ac <<END
AC_INIT$ac_init_args
AM_INIT_AUTOMAKE$am_init_args
+ AC_OUTPUT
END
cat configure.ac # For debugging.
# The error message should mention AC_INIT, not AC_PACKAGE_VERSION.
--
cgit v1.2.1