automake/automake-SuSE.patch

513 lines
16 KiB
Diff
Raw Normal View History

- Update to 1.13.2 (for the full change log please see the file NEWS in the package documentation): * Obsolescent features: - Use of suffix-less info files (that can be specified through the '@setfilename' macro in Texinfo input files) is discouraged, and its use will raise warnings in the 'obsolete' category. - Use of Texinfo input files with '.txi' or '.texinfo' extensions is discouraged, and its use will raise warnings in the 'obsolete' category. You are advised to simply use the '.texi' extension instead. * Documentation fixes: - The long-deprecated but still supported two-arguments invocation form of AM_INIT_AUTOMAKE is documented once again. * Bugs fixed: - When the 'ustar' option is used, the generated configure script no longer risks hanging during the tests for the availability of the 'pax' utility, even if the user running configure has a UID or GID that requires more than 21 bits to be represented. - The obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC work once again, as they did in Automake 1.12.x (albeit printing runtime warnings in the 'obsolete' category). - aclocal will no longer error out if the first local m4 directory (as specified by the '-I' option or the 'AC_CONFIG_MACRO_DIRS' or 'AC_CONFIG_MACRO_DIR' macros) doesn't exist; it will merely report a warning in the 'unsupported' category. - aclocal will no longer consider directories for extra m4 files more than once, even if they are specified multiple times. - Analysis of make flags in Automake-generated rules has been made more robust, and more future-proof. - Adapt automake-SUSE.patch to the changed sources. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=30
2013-05-27 16:46:08 +02:00
---
lib/config.guess | 156 +++++++++++++++++++++++++++++--------------------------
1 file changed, 83 insertions(+), 73 deletions(-)
- Update to 1.13.2 (for the full change log please see the file NEWS in the package documentation): * Obsolescent features: - Use of suffix-less info files (that can be specified through the '@setfilename' macro in Texinfo input files) is discouraged, and its use will raise warnings in the 'obsolete' category. - Use of Texinfo input files with '.txi' or '.texinfo' extensions is discouraged, and its use will raise warnings in the 'obsolete' category. You are advised to simply use the '.texi' extension instead. * Documentation fixes: - The long-deprecated but still supported two-arguments invocation form of AM_INIT_AUTOMAKE is documented once again. * Bugs fixed: - When the 'ustar' option is used, the generated configure script no longer risks hanging during the tests for the availability of the 'pax' utility, even if the user running configure has a UID or GID that requires more than 21 bits to be represented. - The obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC work once again, as they did in Automake 1.12.x (albeit printing runtime warnings in the 'obsolete' category). - aclocal will no longer error out if the first local m4 directory (as specified by the '-I' option or the 'AC_CONFIG_MACRO_DIRS' or 'AC_CONFIG_MACRO_DIR' macros) doesn't exist; it will merely report a warning in the 'unsupported' category. - aclocal will no longer consider directories for extra m4 files more than once, even if they are specified multiple times. - Analysis of make flags in Automake-generated rules has been made more robust, and more future-proof. - Adapt automake-SUSE.patch to the changed sources. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=30
2013-05-27 16:46:08 +02:00
Index: automake-1.15.1/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
+case "${UNAME_MACHINE}" in
+ i?86)
+ test -z "$VENDOR" && VENDOR=pc
+ ;;
+ *)
+ test -z "$VENDOR" && VENDOR=unknown
+ ;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -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.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE}
exit ;;
*: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 ;;
*: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}
exit ;;
*:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
- 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
@@ -325,13 +335,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
echo alpha-dec-winnt3.5
exit ;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
+ echo m68k-${VENDOR}-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
+ echo ${UNAME_MACHINE}-${VENDOR}-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
+ echo ${UNAME_MACHINE}-${VENDOR}-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -346,7 +356,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos
+ echo arm-${VENDOR}-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
@@ -454,7 +464,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
echo m68k-hades-mint${UNAME_RELEASE}
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
+ echo m68k-${VENDOR}-mint${UNAME_RELEASE}
exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
@@ -766,9 +776,9 @@ EOF
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
+ echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
else
- echo ${UNAME_MACHINE}-unknown-osf1
+ echo ${UNAME_MACHINE}-${VENDOR}-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -828,10 +838,10 @@ EOF
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
+ echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
exit ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -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*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -868,10 +878,10 @@ EOF
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
+ echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
+ echo ia64-${VENDOR}-interix${UNAME_RELEASE}
exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -890,31 +900,31 @@ EOF
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
+ echo x86_64-${VENDOR}-cygwin
exit ;;
p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
+ echo powerpcle-${VENDOR}-cygwin
exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
*: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/*:*:*)
# 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 ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -928,29 +938,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 ;;
- Update to 1.13.2 (for the full change log please see the file NEWS in the package documentation): * Obsolescent features: - Use of suffix-less info files (that can be specified through the '@setfilename' macro in Texinfo input files) is discouraged, and its use will raise warnings in the 'obsolete' category. - Use of Texinfo input files with '.txi' or '.texinfo' extensions is discouraged, and its use will raise warnings in the 'obsolete' category. You are advised to simply use the '.texi' extension instead. * Documentation fixes: - The long-deprecated but still supported two-arguments invocation form of AM_INIT_AUTOMAKE is documented once again. * Bugs fixed: - When the 'ustar' option is used, the generated configure script no longer risks hanging during the tests for the availability of the 'pax' utility, even if the user running configure has a UID or GID that requires more than 21 bits to be represented. - The obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC work once again, as they did in Automake 1.12.x (albeit printing runtime warnings in the 'obsolete' category). - aclocal will no longer error out if the first local m4 directory (as specified by the '-I' option or the 'AC_CONFIG_MACRO_DIRS' or 'AC_CONFIG_MACRO_DIR' macros) doesn't exist; it will merely report a warning in the 'unsupported' category. - aclocal will no longer consider directories for extra m4 files more than once, even if they are specified multiple times. - Analysis of make flags in Automake-generated rules has been made more robust, and more future-proof. - Adapt automake-SUSE.patch to the changed sources. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=30
2013-05-27 16:46:08 +02:00
arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
eval $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}
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
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
cris:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
@@ -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}
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- 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}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -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 ;;
- Update to 1.15: New in 1.15: * Improvements and refactorings in the install-sh script: - It has been modernized, and now makes the following assumptions *unconditionally*: (1) a working 'dirname' program is available; (2) the ${var:-value} shell parameters substitution works; (3) the "set -f" and "set +f" shell commands work, and, respectively, disable and enable shell globbing. - The script implements stricter error checking, and now it complains and bails out if any of the following expectations is not met: (1) the options -d and -t are never used together; (2) the argument passed to option -t is a directory; (3) if there are two or more SOURCEFILE arguments, the DESTINATION argument must be a directory. * Automake-generated testsuites: - The default test-driver used by the Automake-generates testsuites now appends the result and exit status of each "plain" test to the associated log file (automake bug#11814). - The perl implementation of the TAP testsuite driver is no longer installed in the Automake's scripts directory, and is instead just distributed as a "contrib" addition. There should be no reason to use this implementation anyway in real packages, since the awk+shell implementation of the TAP driver (which is documented in the manual) is more portable and has feature parity with the perl implementation. - The rule generating 'test-suite.log' no longer risk incurring in an extra useless "make all" recursive invocation in some corner cases (automake bug#16302). * Distribution: - Automake bug#18286: "make distcheck" could sometimes fail to detect files missing from the distribution tarball, especially in those cases where both the generated files and their dependencies are explicitly in $(srcdir). An important example of this are *generated* makefile fragments included at Automake time in Makefile.am; e.g.: ... $(srcdir)/fragment.am: $(srcdir)/data.txt $(srcdir)/preproc.sh cd $(srcdir) && $(SHELL) preproc.sh <data.txt >fragment.am include $(srcdir)/fragment.am ... If the use forgot to add data.txt and/or preproc.sh in the distribution tarball, "make distcheck" would have erroneously succeeded! This issue is now fixed. - As a consequence of the previous change, "make distcheck" will run using '$(distdir)/_build/sub' as the build directory, rather than simply '$(distdir)/_build' (as it was the case for Automake 1.14 and earlier). Consequently, the './configure' and 'make' invocations issued by the distcheck recipe now have $(srcdir) equal to '../..', rather than to just '..'. Dependent and similar variables (e.g., '$(top_srcdir)') are also changed accordingly. Thus, Makefiles that made assumptions about the exact values of the build and source directories used by "make distcheck" will have to be adjusted. Notice that making such assumptions was a bad and unsupported practice anyway, since the exact locations of those directories should be considered implementation details, and we reserve the right to change them at any time. * Miscellaneous bugs fixed: - The expansion of AM_INIT_AUTOMAKE ends once again with a trailing newline (bug#16841). Regression introduced in Automake 1.14. - We no longer risk to use '$ac_aux_dir' before it's defined (see automake bug#15981). Bug introduced in Automake 1.14. - The code used to detect whether the currently used make is GNU make or not (relying on the private macro 'am__is_gnu_make') no longer risks causing "Arg list too long" for projects using automatic dependency tracking and having a ton of source files (bug#18744). - Automake tries to offer a more deterministic output for generated Makefiles, in the face of the newly-introduced randomization for hash keys order in Perl 5.18. - In older Automake versions, if a user defined one single Makefile fragment (say 'foo.am') to be included via Automake includes in his main Makefile.am, and defined a custom make rule to generate that file from other data, Automake used to spuriously complain with some message like "... overrides Automake target '$(srcdir)/foo.am". This bug is now fixed. - The user can now extend the special .PRECIOUS target, the same way he could already do with the .MAKE .and .PHONY targets. - Some confusing typos have been fixed in the manual and in few warning messages (automake bug#16827 and bug#16997). - Remove automake-fix-ac_aux_dir-used-before-initialized.patch as the change is incorporated now. - Refresh automake-SuSE.patch and automake-require_file.patch so that they apply cleanly. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=46
2015-02-10 12:25:10 +01:00
openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC}
+ echo or1k-${VENDOR}-linux-${LIBC}
- Update to 1.13.2 (for the full change log please see the file NEWS in the package documentation): * Obsolescent features: - Use of suffix-less info files (that can be specified through the '@setfilename' macro in Texinfo input files) is discouraged, and its use will raise warnings in the 'obsolete' category. - Use of Texinfo input files with '.txi' or '.texinfo' extensions is discouraged, and its use will raise warnings in the 'obsolete' category. You are advised to simply use the '.texi' extension instead. * Documentation fixes: - The long-deprecated but still supported two-arguments invocation form of AM_INIT_AUTOMAKE is documented once again. * Bugs fixed: - When the 'ustar' option is used, the generated configure script no longer risks hanging during the tests for the availability of the 'pax' utility, even if the user running configure has a UID or GID that requires more than 21 bits to be represented. - The obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC work once again, as they did in Automake 1.12.x (albeit printing runtime warnings in the 'obsolete' category). - aclocal will no longer error out if the first local m4 directory (as specified by the '-I' option or the 'AC_CONFIG_MACRO_DIRS' or 'AC_CONFIG_MACRO_DIR' macros) doesn't exist; it will merely report a warning in the 'unsupported' category. - aclocal will no longer consider directories for extra m4 files more than once, even if they are specified multiple times. - Analysis of make flags in Automake-generated rules has been made more robust, and more future-proof. - Adapt automake-SUSE.patch to the changed sources. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=30
2013-05-27 16:46:08 +02:00
exit ;;
- Update to 1.15: New in 1.15: * Improvements and refactorings in the install-sh script: - It has been modernized, and now makes the following assumptions *unconditionally*: (1) a working 'dirname' program is available; (2) the ${var:-value} shell parameters substitution works; (3) the "set -f" and "set +f" shell commands work, and, respectively, disable and enable shell globbing. - The script implements stricter error checking, and now it complains and bails out if any of the following expectations is not met: (1) the options -d and -t are never used together; (2) the argument passed to option -t is a directory; (3) if there are two or more SOURCEFILE arguments, the DESTINATION argument must be a directory. * Automake-generated testsuites: - The default test-driver used by the Automake-generates testsuites now appends the result and exit status of each "plain" test to the associated log file (automake bug#11814). - The perl implementation of the TAP testsuite driver is no longer installed in the Automake's scripts directory, and is instead just distributed as a "contrib" addition. There should be no reason to use this implementation anyway in real packages, since the awk+shell implementation of the TAP driver (which is documented in the manual) is more portable and has feature parity with the perl implementation. - The rule generating 'test-suite.log' no longer risk incurring in an extra useless "make all" recursive invocation in some corner cases (automake bug#16302). * Distribution: - Automake bug#18286: "make distcheck" could sometimes fail to detect files missing from the distribution tarball, especially in those cases where both the generated files and their dependencies are explicitly in $(srcdir). An important example of this are *generated* makefile fragments included at Automake time in Makefile.am; e.g.: ... $(srcdir)/fragment.am: $(srcdir)/data.txt $(srcdir)/preproc.sh cd $(srcdir) && $(SHELL) preproc.sh <data.txt >fragment.am include $(srcdir)/fragment.am ... If the use forgot to add data.txt and/or preproc.sh in the distribution tarball, "make distcheck" would have erroneously succeeded! This issue is now fixed. - As a consequence of the previous change, "make distcheck" will run using '$(distdir)/_build/sub' as the build directory, rather than simply '$(distdir)/_build' (as it was the case for Automake 1.14 and earlier). Consequently, the './configure' and 'make' invocations issued by the distcheck recipe now have $(srcdir) equal to '../..', rather than to just '..'. Dependent and similar variables (e.g., '$(top_srcdir)') are also changed accordingly. Thus, Makefiles that made assumptions about the exact values of the build and source directories used by "make distcheck" will have to be adjusted. Notice that making such assumptions was a bad and unsupported practice anyway, since the exact locations of those directories should be considered implementation details, and we reserve the right to change them at any time. * Miscellaneous bugs fixed: - The expansion of AM_INIT_AUTOMAKE ends once again with a trailing newline (bug#16841). Regression introduced in Automake 1.14. - We no longer risk to use '$ac_aux_dir' before it's defined (see automake bug#15981). Bug introduced in Automake 1.14. - The code used to detect whether the currently used make is GNU make or not (relying on the private macro 'am__is_gnu_make') no longer risks causing "Arg list too long" for projects using automatic dependency tracking and having a ton of source files (bug#18744). - Automake tries to offer a more deterministic output for generated Makefiles, in the face of the newly-introduced randomization for hash keys order in Perl 5.18. - In older Automake versions, if a user defined one single Makefile fragment (say 'foo.am') to be included via Automake includes in his main Makefile.am, and defined a custom make rule to generate that file from other data, Automake used to spuriously complain with some message like "... overrides Automake target '$(srcdir)/foo.am". This bug is now fixed. - The user can now extend the special .PRECIOUS target, the same way he could already do with the .MAKE .and .PHONY targets. - Some confusing typos have been fixed in the manual and in few warning messages (automake bug#16827 and bug#16997). - Remove automake-fix-ac_aux_dir-used-before-initialized.patch as the change is incorporated now. - Refresh automake-SuSE.patch and automake-require_file.patch so that they apply cleanly. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=46
2015-02-10 12:25:10 +01:00
or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
+ echo sparc-${VENDOR}-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-${VENDOR}-linux-${LIBC}
exit ;;
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} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-${VENDOR}-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
+ echo powerpc-${VENDOR}-linux-${LIBC}
exit ;;
ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC}
+ echo powerpc64le-${VENDOR}-linux-${LIBC}
exit ;;
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 ;;
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}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
@@ -1061,7 +1071,7 @@ EOF
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1083,16 +1093,16 @@ EOF
echo ${UNAME_MACHINE}-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
+ echo ${UNAME_MACHINE}-${VENDOR}-stop
exit ;;
i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
+ echo ${UNAME_MACHINE}-${VENDOR}-atheos
exit ;;
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
+ echo i386-${VENODR}-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
@@ -1112,7 +1122,7 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
@@ -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.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ echo i860-${VENODR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -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*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
+ echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
+ echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
@@ -1250,7 +1260,7 @@ EOF
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-${VENDOR}-sysv${UNAME_RELEASE}
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1266,7 +1276,7 @@ EOF
echo i586-pc-haiku
exit ;;
x86_64:Haiku:*:*)
- echo x86_64-unknown-haiku
+ echo x86_64-${VENDOR}-haiku
exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
@@ -1372,13 +1382,13 @@ EOF
else
UNAME_MACHINE="$cputype"
fi
- echo ${UNAME_MACHINE}-unknown-plan9
+ echo ${UNAME_MACHINE}-${VENDOR}-plan9
exit ;;
*:TOPS-10:*:*)
- echo pdp10-unknown-tops10
+ echo pdp10-${VENDOR}-tops10
exit ;;
*:TENEX:*:*)
- echo pdp10-unknown-tenex
+ echo pdp10-${VENDOR}-tenex
exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
@@ -1387,16 +1397,16 @@ EOF
echo pdp10-xkl-tops20
exit ;;
*:TOPS-20:*:*)
- echo pdp10-unknown-tops20
+ echo pdp10-${VENDOR}-tops20
exit ;;
*:ITS:*:*)
- echo pdp10-unknown-its
+ echo pdp10-${VENDOR}-its
exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -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: automake-1.15.1/lib/config.sub
===================================================================
--- 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
;;
- s390 | s390-*)
+ s390)
basic_machine=s390-ibm
;;
- s390x | s390x-*)
+ s390-*)
+ basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ s390x)
basic_machine=s390x-ibm
;;
+ s390x-*)
+ basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sa29200)
basic_machine=a29k-amd
os=-udi