Hello community, here is the log from the commit of package automake for openSUSE:Factory checked in at 2017-07-05 23:46:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/automake (Old) and /work/SRC/openSUSE:Factory/.automake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "automake" Wed Jul 5 23:46:44 2017 rev:45 rq:506262 version:1.15.1 Changes: -------- --- /work/SRC/openSUSE:Factory/automake/automake-testsuite.changes 2016-07-09 09:19:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.automake.new/automake-testsuite.changes 2017-07-05 23:46:48.126575849 +0200 @@ -1,0 +2,22 @@ +Tue Jun 20 08:43:28 UTC 2017 - [email protected] + +- Update to version 1.15.1: + * The code has been adapted to remove a warning present since + Perl 5.22 stating that "Unescaped left brace in regex is + deprecated". This warning has become an hard error in Perl 5.26 + * The generated Makefiles do not rely on the obsolescent GZIP + environment variable which was used for passing arguments to + 'gzip'. Compatibility with old versions has been preserved. +* Miscellaneous changes: +- Drop no longer needed patches: + * automake-perl-5.22.patch + * automake-fix-tests-gzip.patch +- Add keyring +- Small spec file cleanup + +------------------------------------------------------------------- +Fri Feb 10 07:34:09 UTC 2017 - [email protected] + +- use vendor suse instead of IBM on s390x + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/automake/automake.changes 2017-03-05 17:49:57.387113897 +0100 +++ /work/SRC/openSUSE:Factory/.automake.new/automake.changes 2017-07-05 23:46:48.174569089 +0200 @@ -1,0 +2,17 @@ +Tue Jun 20 08:43:28 UTC 2017 - [email protected] + +- Update to version 1.15.1: + * The code has been adapted to remove a warning present since + Perl 5.22 stating that "Unescaped left brace in regex is + deprecated". This warning has become an hard error in Perl 5.26 + * The generated Makefiles do not rely on the obsolescent GZIP + environment variable which was used for passing arguments to + 'gzip'. Compatibility with old versions has been preserved. +* Miscellaneous changes: +- Drop no longer needed patches: + * automake-perl-5.22.patch + * automake-fix-tests-gzip.patch +- Add keyring +- Small spec file cleanup + +------------------------------------------------------------------- Old: ---- automake-1.15.tar.xz automake-1.15.tar.xz.sig automake-fix-tests-gzip.patch automake-perl-5.22.patch New: ---- automake-1.15.1.tar.xz automake-1.15.1.tar.xz.sig automake.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ automake-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.ZhPFm1/_old 2017-07-05 23:46:48.950459809 +0200 +++ /var/tmp/diff_new_pack.ZhPFm1/_new 2017-07-05 23:46:48.954459246 +0200 @@ -21,40 +21,38 @@ # aren't updated. Name: automake-testsuite -Version: 1.15 +Version: 1.15.1 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ Group: Development/Tools/Building -Url: http://www.gnu.org/software/automake - -Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz -Source2: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig +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 Patch2: automake-require_file.patch Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch -Patch4: automake-perl-5.22.patch Patch5: 0001-correct-parameter-parsing-in-test-driver-script.patch -# fixes failing tests with gzip-1.7 and later (upstream commit id 749468ac63042820bc3da85ece5bed64b0c15d62) -Patch6: automake-fix-tests-gzip.patch Patch100: automake-SuSE.patch -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.69 BuildRequires: bison BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: xz +Requires: autoconf >= 2.69 +Requires: info +Requires(post): info +Requires(preun): info +BuildArch: noarch %if "%{name}" == "automake-testsuite" -BuildRequires: libtool -Requires: libtool -BuildRequires: flex -Requires: flex BuildRequires: expect +BuildRequires: flex +BuildRequires: libtool Requires: expect +Requires: flex +Requires: libtool %endif -Requires: autoconf >= 2.69 -Requires: info %description Automake is a tool for automatically generating "Makefile.in" files @@ -64,34 +62,30 @@ %prep %setup -q -n automake-%{version} -%patch2 +%patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch100 +%patch100 -p1 %build -sh bootstrap.sh +sh bootstrap %configure --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %if "%{name}" == "automake-testsuite" - %check # Some architectures can't keep up the pace. -%ifnarch alpha %arm -make check VERBOSE=1 +%ifnarch alpha %{arm} +make %{?_smp_mflags} check VERBOSE=1 %endif %install %else - %install -make install DESTDIR=%{buildroot} +%make_install mkdir %{buildroot}/etc -echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist -ln -s /etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist +echo %{_prefix}/local/share/aclocal >%{buildroot}%{_sysconfdir}/aclocal_dirlist +ln -s %{_sysconfdir}/aclocal_dirlist %{buildroot}%{_datadir}/aclocal/dirlist install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name} # info's dir file is not auto ignored on some systems rm -rf %{buildroot}%{_infodir}/dir @@ -99,22 +93,21 @@ %endif %post -%install_info --info-dir=%{_infodir} %{_infodir}/automake.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/automake.info%{ext_info} %preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/automake.info%{ext_info} %if "%{name}" == "automake" - %files %defattr(-,root,root) %doc %{_docdir}/%{name} %{_bindir}/* -%doc %{_infodir}/*.gz -%doc %{_mandir}/man1/* +%{_infodir}/*%{ext_info} +%{_mandir}/man1/* %{_datadir}/aclocal* %{_datadir}/automake-* -%config /etc/aclocal_dirlist +%config %{_sysconfdir}/aclocal_dirlist %endif %changelog ++++++ automake.spec ++++++ --- /var/tmp/diff_new_pack.ZhPFm1/_old 2017-07-05 23:46:48.974456429 +0200 +++ /var/tmp/diff_new_pack.ZhPFm1/_new 2017-07-05 23:46:48.974456429 +0200 @@ -21,40 +21,38 @@ # aren't updated. Name: automake -Version: 1.15 +Version: 1.15.1 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ Group: Development/Tools/Building -Url: http://www.gnu.org/software/automake - -Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz -Source2: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig +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 Patch2: automake-require_file.patch Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch -Patch4: automake-perl-5.22.patch Patch5: 0001-correct-parameter-parsing-in-test-driver-script.patch -# fixes failing tests with gzip-1.7 and later (upstream commit id 749468ac63042820bc3da85ece5bed64b0c15d62) -Patch6: automake-fix-tests-gzip.patch Patch100: automake-SuSE.patch -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.69 BuildRequires: bison BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: xz +Requires: autoconf >= 2.69 +Requires: info +Requires(post): info +Requires(preun): info +BuildArch: noarch %if "%{name}" == "automake-testsuite" -BuildRequires: libtool -Requires: libtool -BuildRequires: flex -Requires: flex BuildRequires: expect +BuildRequires: flex +BuildRequires: libtool Requires: expect +Requires: flex +Requires: libtool %endif -Requires: autoconf >= 2.69 -Requires: info %description Automake is a tool for automatically generating "Makefile.in" files @@ -64,34 +62,30 @@ %prep %setup -q -n automake-%{version} -%patch2 +%patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch100 +%patch100 -p1 %build -sh bootstrap.sh +sh bootstrap %configure --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %if "%{name}" == "automake-testsuite" - %check # Some architectures can't keep up the pace. -%ifnarch alpha %arm -make check VERBOSE=1 +%ifnarch alpha %{arm} +make %{?_smp_mflags} check VERBOSE=1 %endif %install %else - %install -make install DESTDIR=%{buildroot} +%make_install mkdir %{buildroot}/etc -echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist -ln -s /etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist +echo %{_prefix}/local/share/aclocal >%{buildroot}%{_sysconfdir}/aclocal_dirlist +ln -s %{_sysconfdir}/aclocal_dirlist %{buildroot}%{_datadir}/aclocal/dirlist install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name} # info's dir file is not auto ignored on some systems rm -rf %{buildroot}%{_infodir}/dir @@ -99,22 +93,21 @@ %endif %post -%install_info --info-dir=%{_infodir} %{_infodir}/automake.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/automake.info%{ext_info} %preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/automake.info%{ext_info} %if "%{name}" == "automake" - %files %defattr(-,root,root) %doc %{_docdir}/%{name} %{_bindir}/* -%doc %{_infodir}/*.gz -%doc %{_mandir}/man1/* +%{_infodir}/*%{ext_info} +%{_mandir}/man1/* %{_datadir}/aclocal* %{_datadir}/automake-* -%config /etc/aclocal_dirlist +%config %{_sysconfdir}/aclocal_dirlist %endif %changelog ++++++ automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch ++++++ --- /var/tmp/diff_new_pack.ZhPFm1/_old 2017-07-05 23:46:48.998453049 +0200 +++ /var/tmp/diff_new_pack.ZhPFm1/_new 2017-07-05 23:46:48.998453049 +0200 @@ -10,10 +10,10 @@ t/primary-prefix-invalid-couples.tap | 2 ++ 1 file changed, 2 insertions(+) -Index: automake-1.13.4/t/primary-prefix-invalid-couples.tap +Index: automake-1.15.1/t/primary-prefix-invalid-couples.tap =================================================================== ---- automake-1.13.4.orig/t/primary-prefix-invalid-couples.tap 2013-06-09 10:31:22.000000000 +0100 -+++ automake-1.13.4/t/primary-prefix-invalid-couples.tap 2013-08-16 22:09:29.000000000 +0100 +--- automake-1.15.1.orig/t/primary-prefix-invalid-couples.tap ++++ automake-1.15.1/t/primary-prefix-invalid-couples.tap @@ -186,7 +186,9 @@ grep -v 'dir.* not a legitimate director # Check that the same failures are present without the '--add-missing' # option. ++++++ automake-1.15.tar.xz -> automake-1.15.1.tar.xz ++++++ ++++ 27484 lines of diff (skipped) ++++++ automake-SuSE.patch ++++++ --- /var/tmp/diff_new_pack.ZhPFm1/_old 2017-07-05 23:46:49.778343206 +0200 +++ /var/tmp/diff_new_pack.ZhPFm1/_new 2017-07-05 23:46:49.782342642 +0200 @@ -2,10 +2,10 @@ lib/config.guess | 156 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 83 insertions(+), 73 deletions(-) -Index: lib/config.guess +Index: automake-1.15.1/lib/config.guess =================================================================== ---- lib/config.guess.orig -+++ lib/config.guess +--- automake-1.15.1.orig/lib/config.guess ++++ automake-1.15.1/lib/config.guess @@ -153,6 +153,16 @@ Linux|GNU|GNU/*) ;; esac @@ -23,7 +23,19 @@ # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -217,23 +227,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -181,9 +191,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` +- machine=${arch}${endian}-unknown ++ machine=${arch}${endian}-${VENDOR}-unknown + ;; +- *) machine=${UNAME_MACHINE_ARCH}-unknown ;; ++ *) machine=${UNAME_MACHINE_ARCH}-${VENDOR}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently (or will in the future) and ABI. +@@ -234,30 +244,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -35,6 +47,11 @@ - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE} exit ;; + *: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 ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE} @@ -51,9 +68,13 @@ - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) +- echo ${UNAME_MACHINE}-unknown-sortix ++ echo ${UNAME_MACHINE}-${VENDOR}-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in -@@ -301,13 +311,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -325,13 +335,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo alpha-dec-winnt3.5 exit ;; Amiga*:UNIX_System_V:4.0:*) @@ -70,7 +91,7 @@ exit ;; *:OS/390:*:*) echo i370-ibm-openedition -@@ -322,7 +332,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -346,7 +356,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo arm-acorn-riscix${UNAME_RELEASE} exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) @@ -79,7 +100,7 @@ exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp -@@ -430,7 +440,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -454,7 +464,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo m68k-hades-mint${UNAME_RELEASE} exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) @@ -88,7 +109,7 @@ exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} -@@ -742,9 +752,9 @@ EOF +@@ -766,9 +776,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then @@ -100,7 +121,7 @@ fi exit ;; parisc*:Lites*:*:*) -@@ -804,18 +814,18 @@ EOF +@@ -828,10 +838,10 @@ EOF echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit ;; sparc*:BSD/OS:*:*) @@ -113,17 +134,16 @@ exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in - amd64) -- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo x86_64-${VENDOR}-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/[-(].*//'` ;; +@@ -841,7 +851,7 @@ EOF + i386) + 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 ;; i*:CYGWIN*:*) -@@ -843,10 +853,10 @@ EOF + echo ${UNAME_MACHINE}-pc-cygwin +@@ -868,10 +878,10 @@ EOF echo i586-pc-interix${UNAME_RELEASE} exit ;; authenticamd | genuineintel | EM64T) @@ -136,7 +156,7 @@ exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -@@ -865,31 +875,31 @@ EOF +@@ -890,31 +900,31 @@ EOF echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) @@ -158,8 +178,8 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland -- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} -+ echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``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} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -175,10 +195,10 @@ exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -903,29 +913,29 @@ EOF +@@ -928,29 +938,29 @@ EOF esac 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}-${VENDOR}-linux-${LIBC} exit ;; @@ -211,9 +231,13 @@ exit ;; cris:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} -@@ -934,22 +944,22 @@ EOF +@@ -959,28 +969,28 @@ EOF echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} @@ -229,6 +253,10 @@ - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; + k1om:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} @@ -239,13 +267,17 @@ exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build -@@ -968,63 +978,63 @@ EOF +@@ -999,60 +1009,60 @@ EOF #endif EOF 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}-${VENDOR}-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-${VENDOR}-linux-${LIBC} @@ -289,10 +321,13 @@ - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-${VENDOR}-linux-${LIBC} exit ;; - s390:Linux:*:* | s390x:Linux:*:*) -- echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + riscv32:Linux:*:* | riscv64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} @@ -311,10 +346,8 @@ exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} +@@ -1061,7 +1071,7 @@ EOF + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -322,7 +355,7 @@ exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -1046,16 +1056,16 @@ EOF +@@ -1083,16 +1093,16 @@ EOF echo ${UNAME_MACHINE}-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) @@ -342,7 +375,7 @@ exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp -@@ -1075,7 +1085,7 @@ EOF +@@ -1112,7 +1122,7 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac @@ -351,7 +384,7 @@ exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then -@@ -1114,7 +1124,7 @@ EOF +@@ -1151,7 +1161,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. @@ -360,7 +393,7 @@ fi exit ;; mini*:CTIX:SYS*5:*) -@@ -1151,19 +1161,19 @@ EOF +@@ -1188,19 +1198,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*:*) @@ -384,7 +417,7 @@ exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} -@@ -1213,7 +1223,7 @@ EOF +@@ -1250,7 +1260,7 @@ EOF if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -393,7 +426,7 @@ fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. -@@ -1229,7 +1239,7 @@ EOF +@@ -1266,7 +1276,7 @@ EOF echo i586-pc-haiku exit ;; x86_64:Haiku:*:*) @@ -402,7 +435,7 @@ exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} -@@ -1322,13 +1332,13 @@ EOF +@@ -1372,13 +1382,13 @@ EOF else UNAME_MACHINE="$cputype" fi @@ -419,7 +452,7 @@ exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 -@@ -1337,16 +1347,16 @@ EOF +@@ -1387,16 +1397,16 @@ EOF echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) @@ -439,20 +472,24 @@ exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1368,7 +1378,7 @@ EOF +@@ -1418,10 +1428,10 @@ EOF echo ${UNAME_MACHINE}-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo ${UNAME_MACHINE}-${VENDOR}-esx exit ;; + amd64:Isilon\ OneFS:*:*) +- echo x86_64-unknown-onefs ++ echo x86_64-${VENDOR}-onefs + exit ;; esac -Index: lib/config.sub +Index: automake-1.15.1/lib/config.sub =================================================================== ---- lib/config.sub.orig -+++ lib/config.sub -@@ -1058,12 +1058,18 @@ case $basic_machine in +--- automake-1.15.1.orig/lib/config.sub ++++ automake-1.15.1/lib/config.sub +@@ -1078,12 +1078,18 @@ case $basic_machine in rtpc | rtpc-*) basic_machine=romp-ibm ;; ++++++ automake-require_file.patch ++++++ --- /var/tmp/diff_new_pack.ZhPFm1/_old 2017-07-05 23:46:49.798340389 +0200 +++ /var/tmp/diff_new_pack.ZhPFm1/_new 2017-07-05 23:46:49.798340389 +0200 @@ -2,11 +2,11 @@ bin/automake.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: bin/automake.in +Index: automake-1.15.1/bin/automake.in =================================================================== ---- bin/automake.in.orig 2015-01-05 20:25:55.000000000 +0100 -+++ bin/automake.in 2015-02-10 12:06:26.983385721 +0100 -@@ -7389,12 +7389,14 @@ sub required_file_check_or_copy +--- automake-1.15.1.orig/bin/automake.in ++++ automake-1.15.1/bin/automake.in +@@ -7393,12 +7393,14 @@ sub required_file_check_or_copy my $fullfile = "$dir/$file"; my $found_it = 0; my $dangling_sym = 0;
