diff --git a/.automake.metadata b/.automake.metadata deleted file mode 100644 index c829817..0000000 --- a/.automake.metadata +++ /dev/null @@ -1 +0,0 @@ -1012bc79956013d53da0890f8493388a6cb20831 SOURCES/automake-1.16.1.tar.xz diff --git a/.gitignore b/.gitignore index 3f7b105..0deabfc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/automake-1.16.1.tar.xz +automake-1.16.5.tar.xz diff --git a/0001-python-support-noinst_PYTHON-preceding-foo_PYTHON.patch b/0001-python-support-noinst_PYTHON-preceding-foo_PYTHON.patch new file mode 100644 index 0000000..5d60b9a --- /dev/null +++ b/0001-python-support-noinst_PYTHON-preceding-foo_PYTHON.patch @@ -0,0 +1,58 @@ +From ab347652df9ff8f65ba1be6aaa357cf3c2b16dca Mon Sep 17 00:00:00 2001 +From: Bogdan +Date: Wed, 5 Jul 2023 08:59:29 -0700 +Subject: [PATCH] python: support noinst_PYTHON preceding foo_PYTHON. + +This change fixes https://bugs.gnu.org/24507. + +* lib/am/python.am (am__pep3147_tweak): remove conditional +on %?INSTALL%. +* t/python-pr10995.sh: test with make uninstall. +--- + lib/am/python.am | 4 ++-- + t/python-pr10995.sh | 6 ++++++ + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/lib/am/python.am b/lib/am/python.am +index 98f95af1b..19f268efc 100644 +--- a/lib/am/python.am ++++ b/lib/am/python.am +@@ -94,11 +94,11 @@ endif %?INSTALL% + ## Uninstalling. ## + ## -------------- ## + +-if %?INSTALL% +- + ?FIRST?am__pep3147_tweak = \ + ?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc __pycache__/&.*.pyo|' + ++if %?INSTALL% ++ + .PHONY uninstall-am: uninstall-%DIR%PYTHON + uninstall-%DIR%PYTHON: + @$(NORMAL_UNINSTALL) +diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh +index 324be916e..abeb8a124 100644 +--- a/t/python-pr10995.sh ++++ b/t/python-pr10995.sh +@@ -17,6 +17,9 @@ + # Test automake bug#10995: am__py_compile doesn't get correctly defined + # when there a 'noinst_PYTHON' declaration precedes a 'foo_PYTHON' + # declaration. ++# Test also automake bug#24507: am__pep3147_tweak doesn't get correctly ++# defined when there a 'noinst_PYTHON' declaration precedes a 'foo_PYTHON' ++# declaration and 'make uninstall' fails functionally (just shows errors). + + required=python + . test-init.sh +@@ -53,4 +56,7 @@ py_installed --not inst/py/no.pyc + + $MAKE disttest + ++LC_ALL=C run_make -M uninstall ++grep 'command substitution' output && exit 1 ++ + : +-- +2.47.0 + diff --git a/0001-test-another-check-for-PEP-3147-induced-by-Python-3..patch b/0001-test-another-check-for-PEP-3147-induced-by-Python-3..patch new file mode 100644 index 0000000..a83b1f6 --- /dev/null +++ b/0001-test-another-check-for-PEP-3147-induced-by-Python-3..patch @@ -0,0 +1,32 @@ +From f5b7751be8fb0fb9238f1d6acd5d6b592ad942cc Mon Sep 17 00:00:00 2001 +From: Bogdan +Date: Sun, 28 Jan 2024 18:12:50 -0800 +Subject: [PATCH] test: another check for PEP-3147 induced by Python 3.12.1. + +Fix for more of https://bugs.gnu.org/68119. + +* t/ax/am-test-lib.sh (python_has_pep3147) : +check sys.implementation.cache_tag as well as the (old) +imp.get_tag. For Python 3.12.1. +--- + t/ax/am-test-lib.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh +index 547b82bd4..72f409784 100644 +--- a/t/ax/am-test-lib.sh ++++ b/t/ax/am-test-lib.sh +@@ -634,6 +634,10 @@ python_has_pep3147 () + am_pep3147_tag=$($PYTHON -c 'import imp; print(imp.get_tag())') \ + || am_pep3147_tag=none + fi ++ if test "$am_pep3147_tag" = "none"; then ++ am_pep3147_tag=$($PYTHON -c 'import sys; print(sys.implementation.cache_tag)') \ ++ || am_pep3147_tag=none ++ fi + test $am_pep3147_tag != none + } + am_pep3147_tag= +-- +2.47.0 + diff --git a/0001-test-avoid-apostrophe-in-test-document.patch b/0001-test-avoid-apostrophe-in-test-document.patch new file mode 100644 index 0000000..1e4a0ab --- /dev/null +++ b/0001-test-avoid-apostrophe-in-test-document.patch @@ -0,0 +1,51 @@ +From ed1368e8803e8934a8bbab52a38753484dba2a37 Mon Sep 17 00:00:00 2001 +From: Karl Berry +Date: Mon, 12 Dec 2022 14:50:33 -0800 +Subject: [PATCH] test: avoid apostrophe in test document. + +From automake patch https://bugs.gnu.org/59989 +(though a different solution), suggestion by Frederic Berat. + +* t/txinfo-include.sh: avoid apostrophes in test document, +since Texinfo 7.0 turns them into UTF-8 by default. +--- + t/txinfo-include.sh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh +index 8a15f01b0..10fff0753 100644 +--- a/t/txinfo-include.sh ++++ b/t/txinfo-include.sh +@@ -28,6 +28,9 @@ main_TEXINFOS = one.texi two.texi three.texi + sub_more_TEXINFOS = sub/desc.texi sub/hist.texi + END + ++# We avoid apostrophes in the test document since Texinfo ++# turns them into UTF-8, which is not easy to grep. ++# + cat > main.texi << 'END' + \input texinfo + @setfilename main.info +@@ -61,8 +64,8 @@ END + + cat > three.texi << 'END' + @node three +-@chapter Chapter two +-GNU's Not Unix. ++@chapter Chapter three ++Quux quux quux. + END + + mkdir sub +@@ -106,7 +109,7 @@ check_info_contents () + srcdir=${1-.} + $FGREP "Foo bar, baz." $srcdir/main.info + $FGREP "Blah Blah Blah." $srcdir/main.info +- $FGREP "GNU's Not Unix." $srcdir/main.info ++ $FGREP "Quux quux quux." $srcdir/main.info + $FGREP 'It does something, really.' $srcdir/sub/more.info + $FGREP 'It was written somehow.' $srcdir/sub/more.info + } +-- +2.39.0 + diff --git a/0001-tests-Fix-type-defaults-error-in-link_cond-due-to-ma.patch b/0001-tests-Fix-type-defaults-error-in-link_cond-due-to-ma.patch new file mode 100644 index 0000000..e08b977 --- /dev/null +++ b/0001-tests-Fix-type-defaults-error-in-link_cond-due-to-ma.patch @@ -0,0 +1,31 @@ +From 2a9908da9dbc075ee6c4e853cf3be0365b15f202 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= +Date: Mon, 12 Dec 2022 08:05:53 +0100 +Subject: [PATCH] tests: Fix 'type defaults' error in link_cond due to main not + being properly declared + +This is related to an effort to prepare Automake for future GCC/Clang +versions which set c99 as default standard to be used. +Not properly declaring main as "int main(...)" is rejected since c99. + +* t/link_cond.sh: Add (void) to main definition. +--- + t/link_cond.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/link_cond.sh b/t/link_cond.sh +index 45d0d7f40..889623131 100644 +--- a/t/link_cond.sh ++++ b/t/link_cond.sh +@@ -52,7 +52,7 @@ $AUTOCONF + rm -f *.c++ + cat > less.c <<'END' + /* Valid C but deliberately invalid C++ */ +-main () ++int main (void) + { + int new = 0; + return new; +-- +2.39.1 + diff --git a/0001-tests-depcomp-ensure-make_ok-fails-when-run_make-fai.patch b/0001-tests-depcomp-ensure-make_ok-fails-when-run_make-fai.patch new file mode 100644 index 0000000..5ffb9c6 --- /dev/null +++ b/0001-tests-depcomp-ensure-make_ok-fails-when-run_make-fai.patch @@ -0,0 +1,34 @@ +From 6d6fc91c472fd84bd71a1b012fa9ab77bd94efea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= +Date: Mon, 12 Dec 2022 07:32:13 +0100 +Subject: [PATCH] tests: depcomp: ensure make_ok() fails when run_make fails + +While running automake tests with -std-gnu=c99, the compiler report +errors which lead to make to fail. Yet, these failures are ignored +during the tests, which considers them to be successful as stderror is +check for one specific pattern. + +If make fails, investigation should be made to discover why, whatever +the reason for the failure is. + +* t/ax/depcomp.sh: Make make_ok fail when make fails. +--- + t/ax/depcomp.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh +index 3c4db10e3..7a3ac63a7 100644 +--- a/t/ax/depcomp.sh ++++ b/t/ax/depcomp.sh +@@ -160,7 +160,7 @@ case $depcomp_with_libtool in + echo lib_LTLIBRARIES = libfoo.la >> Makefile.am + make_ok () + { +- run_make -M -- ${1+"$@"} ++ run_make -M -- ${1+"$@"} || return 1 + $FGREP 'unknown directive' output && return 1 + rm -f output + # Checks for stray files possibly left around by less common +-- +2.39.1 + diff --git a/SOURCES/0001-python-add-3.10-3.15-to-the-version-search-list.patch b/SOURCES/0001-python-add-3.10-3.15-to-the-version-search-list.patch deleted file mode 100644 index d1a2696..0000000 --- a/SOURCES/0001-python-add-3.10-3.15-to-the-version-search-list.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 930a9a73f4bb776ec334eff4cf6e182802841daa Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 26 Jan 2022 06:33:19 -0500 -Subject: [PATCH] python: add 3.10 - 3.15 to the version search list - -Fixes automake bug https://bugs.gnu.org/53530. - -Based on the cadence of Automake releases, add the current Python -release (3.10), the current Python development (3.11), and then 4 -more versions on top of that. It doesn't hurt to check for a few -extra versions here since this is the fallback logic when the main -`python` and `python3` programs aren't found. - -* m4/python.m4: Add python3.10 - python3.15. -* NEWS: Mention new Python versions. - -Conflicts: - - NEWS (removed) ---- - m4/python.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/python.m4 b/m4/python.m4 -index 4a007fd75..4bf72286a 100644 ---- a/m4/python.m4 -+++ b/m4/python.m4 -@@ -38,6 +38,7 @@ AC_DEFUN([AM_PATH_PYTHON], - dnl supported. (2.0 was released on October 16, 2000). - m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python3 dnl -+ python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 dnl - python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl - python3.2 python3.1 python3.0 dnl - python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl --- -2.41.0 - diff --git a/SOURCES/automake-1.15-disable-vala-tests.patch b/SOURCES/automake-1.15-disable-vala-tests.patch deleted file mode 100644 index dbbbe3f..0000000 --- a/SOURCES/automake-1.15-disable-vala-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Pavel Raiskup -Date: Tue, 7 Jul 2015 11:46:24 +0200 -Subject: [PATCH] tests: disable vala testcases - -Currently broken vala installation in Fedora? Upstream thread: -http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12522 - -diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk -index 9363ee3..b99f15c 100644 ---- a/t/list-of-tests.mk -+++ b/t/list-of-tests.mk -@@ -1239,16 +1239,6 @@ t/upc2.sh \ - t/upc3.sh \ - t/vala-configure.sh \ - t/vala-grepping.sh \ --t/vala-headers.sh \ --t/vala-libs.sh \ --t/vala-mix.sh \ --t/vala-mix2.sh \ --t/vala-non-recursive-setup.sh \ --t/vala-parallel.sh \ --t/vala-per-target-flags.sh \ --t/vala-recursive-setup.sh \ --t/vala-vapi.sh \ --t/vala-vpath.sh \ - t/vars.sh \ - t/vars3.sh \ - t/var-recurs.sh \ diff --git a/SOURCES/automake-1.16-pep3147-tweak-fix.patch b/SOURCES/automake-1.16-pep3147-tweak-fix.patch deleted file mode 100644 index c9f278f..0000000 --- a/SOURCES/automake-1.16-pep3147-tweak-fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/lib/am/python.am b/lib/am/python.am -index 21e6f842c..e29ecfcd0 100644 ---- a/lib/am/python.am -+++ b/lib/am/python.am -@@ -97,7 +97,7 @@ endif %?INSTALL% - if %?INSTALL% - - ?FIRST?am__pep3147_tweak = \ --?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|' -+?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' - - .PHONY uninstall-am: uninstall-%DIR%PYTHON - uninstall-%DIR%PYTHON: -@@ -108,19 +108,26 @@ uninstall-%DIR%PYTHON: - test -n "$$py_files" || exit 0; \ - dir='$(DESTDIR)$(%NDIR%dir)'; \ - ## Also remove the .pyc and .pyo byte compiled versions. -+## This is somewhat tricky, because for newer pythons we have to take -+## PEP-3147 into account. - pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ - pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ -+ py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ -+ echo "$$py_files_pep3147";\ -+ pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ -+ pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ - st=0; \ -- for files in "$$py_files" "$$pyc_files" "$$pyo_files"; do \ -+ for files in \ -+ "$$py_files" \ -+ "$$pyc_files" \ -+ "$$pyo_files" \ -+## Installation of '.py' files is not influenced by PEP-3147, so it -+## is correct *not* to have $pyfiles_pep3147 here. -+ "$$pyc_files_pep3147" \ -+ "$$pyo_files_pep3147" \ -+ ; do \ - $(am__uninstall_files_from_dir) || st=$$?; \ - done; \ --## This is somewhat tricky, because for newer pythons we have to take PEP-3147 --## into account. Avoid exceeding the command-line length limit. -- dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \ -- echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \ -- while read files; do \ -- $(am__uninstall_files_from_dir) || st=$$?; \ -- done || exit $$?; \ - exit $$st - endif %?INSTALL% - diff --git a/SOURCES/automake-1.16.1-python-version-multiple-digits.patch b/SOURCES/automake-1.16.1-python-version-multiple-digits.patch deleted file mode 100644 index 33c92f4..0000000 --- a/SOURCES/automake-1.16.1-python-version-multiple-digits.patch +++ /dev/null @@ -1,86 +0,0 @@ -From e21d46fddd0753e66a4acda88317670fee07f3e6 Mon Sep 17 00:00:00 2001 -From: "Miro Hron\\v{c}ok" -Date: Tue, 27 Oct 2020 14:33:46 -0700 -Subject: [PATCH] python: determine Python (3.10) version number correctly. - -This change fixes https://bugs.gnu.org/44239 -(and https://bugzilla.redhat.com/show_bug.cgi?id=1889732). - -* m4/python.m4: use print('%u.%u' % sys.version_info[:2]) for -the version number instead of merely sys.version[:3], so the -numbers are treated as numbers. -* t/python-vars.sh (PYTHON_VERSION): Likewise. -* doc/automake.texi: Document it. -* NEWS: mention it. (Minor tweaks from Karl Berry.) - -Conflicts: - - NEWS (Removed) ---- - doc/automake.texi | 2 +- - m4/python.m4 | 12 +++++++----- - t/python-vars.sh | 4 +++- - 3 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/doc/automake.texi b/doc/automake.texi -index 2df214a01..1b9d5d0f6 100644 ---- a/doc/automake.texi -+++ b/doc/automake.texi -@@ -7761,7 +7761,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) - @item PYTHON_VERSION - The Python version number, in the form @var{major}.@var{minor} - (e.g., @samp{2.5}). This is currently the value of --@samp{sys.version[:3]}. -+@samp{'%u.%u' % sys.version_info[:2]}. - - @item PYTHON_PREFIX - The string @samp{$@{prefix@}}. This term may be used in future work -diff --git a/m4/python.m4 b/m4/python.m4 -index 63c0a0e04..4a007fd75 100644 ---- a/m4/python.m4 -+++ b/m4/python.m4 -@@ -1,7 +1,7 @@ - ## ------------------------ -*- Autoconf -*- - ## Python file handling - ## From Andrew Dalke --## Updated by James Henstridge -+## Updated by James Henstridge and other contributors. - ## ------------------------ - # Copyright (C) 1999-2018 Free Software Foundation, Inc. - # -@@ -86,12 +86,14 @@ AC_DEFUN([AM_PATH_PYTHON], - m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) - else - -- dnl Query Python for its version number. Getting [:3] seems to be -- dnl the best way to do this; it's what "site.py" does in the standard -- dnl library. -+ dnl Query Python for its version number. Although site.py simply uses -+ dnl sys.version[:3], printing that failed with Python 3.10, since the -+ dnl trailing zero was eliminated. So now we output just the major -+ dnl and minor version numbers, as numbers. Apparently the tertiary -+ dnl version is not of interest. - - AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], -- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) -+ [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`]) - AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) - - dnl Use the values of $prefix and $exec_prefix for the corresponding -diff --git a/t/python-vars.sh b/t/python-vars.sh -index 51107be48..13616101a 100644 ---- a/t/python-vars.sh -+++ b/t/python-vars.sh -@@ -28,7 +28,9 @@ CONFIG_SITE=/dev/null; export CONFIG_SITE - # vary among different python installations, so we need more relaxed - # and ad-hoc checks for them. Also, more proper "functional" checks - # on them should be done in the 'python-virtualenv.sh' test. --PYTHON_VERSION=$($PYTHON -c 'import sys; print(sys.version[:3])') || exit 1 -+# -+# This version identification is duplicated in python.m4 (and the manual). -+PYTHON_VERSION=$($PYTHON -c 'import sys; print("%u.%u" % sys.version_info[:2])') || exit 1 - PYTHON_PLATFORM=$($PYTHON -c 'import sys; print(sys.platform)') || exit 1 - PYTHON_EXEC_PREFIX='${exec_prefix}' - PYTHON_PREFIX='${prefix}' --- -2.41.0 - diff --git a/SOURCES/config.guess b/SOURCES/config.guess deleted file mode 100755 index 256083a..0000000 --- a/SOURCES/config.guess +++ /dev/null @@ -1,1476 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright 1992-2018 Free Software Foundation, Inc. - -timestamp='2018-03-08' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). -# -# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. -# -# You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess -# -# Please send patches to . - - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Options: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright 1992-2018 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > "$dummy.c" ; - for c in cc gcc c89 c99 ; do - if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -case "$UNAME_SYSTEM" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval "$set_cc_for_build" - cat <<-EOF > "$dummy.c" - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" - - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl - fi - ;; -esac - -# Note: order is significant - the case branches are not exclusive. - -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ - echo unknown)` - case "$UNAME_MACHINE_ARCH" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - 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="$UNAME_MACHINE_ARCH"-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in - earm*) - os=netbsdelf - ;; - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval "$set_cc_for_build" - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in - earm*) - expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in - Debian*) - release='-gnu' - ;; - *) - release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi}" - exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" - exit ;; - *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" - exit ;; - *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" - exit ;; - *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" - exit ;; - *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" - exit ;; - *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" - exit ;; - *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix - exit ;; - *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox - exit ;; - mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE=alpha ;; - "EV4.5 (21064)") - UNAME_MACHINE=alpha ;; - "LCA4 (21066/21068)") - UNAME_MACHINE=alpha ;; - "EV5 (21164)") - UNAME_MACHINE=alphaev5 ;; - "EV5.6 (21164A)") - UNAME_MACHINE=alphaev56 ;; - "EV5.6 (21164PC)") - UNAME_MACHINE=alphapca56 ;; - "EV5.7 (21164PC)") - UNAME_MACHINE=alphapca57 ;; - "EV6 (21264)") - UNAME_MACHINE=alphaev6 ;; - "EV6.7 (21264A)") - UNAME_MACHINE=alphaev67 ;; - "EV6.8CB (21264C)") - UNAME_MACHINE=alphaev68 ;; - "EV6.8AL (21264B)") - UNAME_MACHINE=alphaev68 ;; - "EV6.8CX (21264D)") - UNAME_MACHINE=alphaev68 ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE=alphaev69 ;; - "EV7 (21364)") - UNAME_MACHINE=alphaev7 ;; - "EV7.9 (21364A)") - UNAME_MACHINE=alphaev79 ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix"$UNAME_RELEASE" - exit ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux"$UNAME_RELEASE" - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval "$set_cc_for_build" - SUN_ARCH=i386 - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH=x86_64 - fi - fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos"$UNAME_RELEASE" - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos"$UNAME_RELEASE" - ;; - sun4) - echo sparc-sun-sunos"$UNAME_RELEASE" - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos"$UNAME_RELEASE" - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint"$UNAME_RELEASE" - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint"$UNAME_RELEASE" - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint"$UNAME_RELEASE" - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten"$UNAME_RELEASE" - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten"$UNAME_RELEASE" - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix"$UNAME_RELEASE" - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix"$UNAME_RELEASE" - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix"$UNAME_RELEASE" - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval "$set_cc_for_build" - sed 's/^ //' << EOF > "$dummy.c" -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && - dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`"$dummy" "$dummyarg"` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos"$UNAME_RELEASE" - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] - then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] - then - echo m88k-dg-dgux"$UNAME_RELEASE" - else - echo m88k-dg-dguxbcs"$UNAME_RELEASE" - fi - else - echo i586-dg-dgux"$UNAME_RELEASE" - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" - fi - echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval "$set_cc_for_build" - sed 's/^ //' << EOF > "$dummy.c" - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` - else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" - fi - echo "$IBM_ARCH"-ibm-aix"$IBM_REV" - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in - 9000/31?) HP_ARCH=m68000 ;; - 9000/[34]??) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in - 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 - 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "$sc_kernel_bits" in - 32) HP_ARCH=hppa2.0n ;; - 64) HP_ARCH=hppa2.0w ;; - '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "$HP_ARCH" = "" ]; then - eval "$set_cc_for_build" - sed 's/^ //' << EOF > "$dummy.c" - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ "$HP_ARCH" = hppa2.0w ] - then - eval "$set_cc_for_build" - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH=hppa2.0w - else - HP_ARCH=hppa64 - fi - fi - echo "$HP_ARCH"-hp-hpux"$HPUX_REV" - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux"$HPUX_REV" - exit ;; - 3050*:HI-UX:*:*) - eval "$set_cc_for_build" - sed 's/^ //' << EOF > "$dummy.c" - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo "$UNAME_MACHINE"-unknown-osf1mk - else - echo "$UNAME_MACHINE"-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - 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" - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi"$UNAME_RELEASE" - exit ;; - *:BSD/OS:*:*) - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" - exit ;; - *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in - amd64) - UNAME_PROCESSOR=x86_64 ;; - i386) - UNAME_PROCESSOR=i586 ;; - esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; - i*:CYGWIN*:*) - echo "$UNAME_MACHINE"-pc-cygwin - exit ;; - *:MINGW64*:*) - echo "$UNAME_MACHINE"-pc-mingw64 - exit ;; - *:MINGW*:*) - echo "$UNAME_MACHINE"-pc-mingw32 - exit ;; - *:MSYS*:*) - echo "$UNAME_MACHINE"-pc-msys - exit ;; - i*:PW*:*) - echo "$UNAME_MACHINE"-pc-pw32 - exit ;; - *:Interix*:*) - case "$UNAME_MACHINE" in - x86) - echo i586-pc-interix"$UNAME_RELEASE" - exit ;; - authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix"$UNAME_RELEASE" - exit ;; - IA64) - echo ia64-unknown-interix"$UNAME_RELEASE" - exit ;; - esac ;; - i*:UWIN*:*) - echo "$UNAME_MACHINE"-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-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,/.*$,,'`" - 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" - exit ;; - i*86:Minix:*:*) - echo "$UNAME_MACHINE"-pc-minix - exit ;; - aarch64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-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" - 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 - else - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf - fi - fi - exit ;; - avr32*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - cris:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; - crisv32:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; - e2k:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - frv:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - hexagon:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - i*86:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; - ia64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - k1om:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - m32r*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - m68*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval "$set_cc_for_build" - sed 's/^ //' << EOF > "$dummy.c" - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" - test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } - ;; - mips64el:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-"$LIBC" - exit ;; - or32:Linux:*:* | or1k*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-"$LIBC" - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-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" ;; - esac - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-"$LIBC" - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-"$LIBC" - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-"$LIBC" - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-"$LIBC" - exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" - exit ;; - sh64*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - sh*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - tile*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - vax:Linux:*:*) - echo "$UNAME_MACHINE"-dec-linux-"$LIBC" - exit ;; - x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; - xtensa*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # 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" - 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 - exit ;; - i*86:XTS-300:*:STOP) - echo "$UNAME_MACHINE"-unknown-stop - exit ;; - i*86:atheos:*:*) - echo "$UNAME_MACHINE"-unknown-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" - exit ;; - i*86:*DOS:*:*) - echo "$UNAME_MACHINE"-pc-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" - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /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 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" - else - echo "$UNAME_MACHINE"-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # 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 - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - 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 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } - /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" - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos"$UNAME_RELEASE" - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos"$UNAME_RELEASE" - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos"$UNAME_RELEASE" - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv"$UNAME_RELEASE" - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo "$UNAME_MACHINE"-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo "$UNAME_MACHINE"-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux"$UNAME_RELEASE" - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv"$UNAME_RELEASE" - else - echo mips-unknown-sysv"$UNAME_RELEASE" - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux"$UNAME_RELEASE" - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux"$UNAME_RELEASE" - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux"$UNAME_RELEASE" - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux"$UNAME_RELEASE" - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux"$UNAME_RELEASE" - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux"$UNAME_RELEASE" - exit ;; - SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux"$UNAME_RELEASE" - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody"$UNAME_RELEASE" - exit ;; - *:Rhapsody:*:*) - echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval "$set_cc_for_build" - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi - fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 - fi - echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = x86; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk"$UNAME_RELEASE" - exit ;; - NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk"$UNAME_RELEASE" - exit ;; - NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk"$UNAME_RELEASE" - exit ;; - NSV-*:NONSTOP_KERNEL:*:*) - echo nsv-tandem-nsk"$UNAME_RELEASE" - exit ;; - NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk"$UNAME_RELEASE" - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = 386; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo "$UNAME_MACHINE"-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux"$UNAME_RELEASE" - exit ;; - *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" - exit ;; - i*86:rdos:*:*) - echo "$UNAME_MACHINE"-pc-rdos - exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros - exit ;; - x86_64:VMkernel:*:*) - echo "$UNAME_MACHINE"-unknown-esx - exit ;; - amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; -esac - -echo "$0: unable to guess system type" >&2 - -case "$UNAME_MACHINE:$UNAME_SYSTEM" in - mips:Linux | mips64:Linux) - # If we got here on MIPS GNU/Linux, output extra information. - cat >&2 <&2 </dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = "$UNAME_MACHINE" -UNAME_RELEASE = "$UNAME_RELEASE" -UNAME_SYSTEM = "$UNAME_SYSTEM" -UNAME_VERSION = "$UNAME_VERSION" -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/SOURCES/config.sub b/SOURCES/config.sub deleted file mode 100755 index 20f7cf2..0000000 --- a/SOURCES/config.sub +++ /dev/null @@ -1,1833 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright 1992-2018 Free Software Foundation, Inc. - -timestamp='2018-05-05' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). - - -# Please send patches to . -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS - -Canonicalize a configuration name. - -Options: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright 1992-2018 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo "$1" - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Spilt fields of configuration type -IFS="-" read -r field1 field2 field3 field4 <&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nfp-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | wasm32-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-pc - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2*) - basic_machine=m68k-bull - os=-sysv3 - ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" - ;; - e500v[12]-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=$os"spe" - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; - i*86v32) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - nsv-tandem) - basic_machine=nsv-tandem - ;; - nsx-tandem) - basic_machine=nsx-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - x64) - basic_machine=x86_64-pc - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x$os != x ] -then -case $os in - # First match some system type aliases that might get confused - # with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # es1800 is here to avoid being matched by es* (a different OS) - -es1800*) - os=-ose - ;; - # Now accept the basic system types. - # The portable systems comes first. - # Each alternative MUST end in a * to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ - | -midnightbsd*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -xray | -os68k* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo "$os" | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo "$os" | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo "$os" | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4*) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -pikeos*) - # Until real need of OS specific support for - # particular features comes up, bare metal - # configurations are quite functional. - case $basic_machine in - arm*) - os=-eabi - ;; - *) - os=-elf - ;; - esac - ;; - -nacl*) - ;; - -ios) - ;; - -none) - ;; - -*-eabi) - case $basic_machine in - arm*) - ;; - esac - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - c8051-*) - os=-elf - ;; - hexagon-*) - os=-elf - ;; - tic54x-*) - os=-coff - ;; - tic55x-*) - os=-coff - ;; - tic6x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - pru-*) - os=-elf - ;; - *-be) - os=-beos - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -cnk*|-aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` - ;; -esac - -echo "$basic_machine$os" -exit - -# Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/SPECS/automake.spec b/automake.spec similarity index 73% rename from SPECS/automake.spec rename to automake.spec index 03de662..b67ff3f 100644 --- a/SPECS/automake.spec +++ b/automake.spec @@ -1,5 +1,16 @@ %global api_version 1.16 +# redhat-rpm-config sets CFLAGS, CXXFLAGS and LDFLAGS, but not +# OBJCFLAGS. This means that Obj-C tests will be compiled without hardening +# flags, and then fail when linked with the hardened linker flags. +# We therefore need to disable build flags to be able to test automake itself. +# Since the automake executables are all interpreted languages, they aren't +# compiled and so the build flags only affect the tests anyway. +%undefine _auto_set_build_flags + +# do not mangle shebang in files which are part of bootstraped project +%global __brp_mangle_shebangs_exclude_from /usr/share/automake-%{api_version} + # run "make check" by default %bcond_without check # Run optional test @@ -10,32 +21,65 @@ Summary: A GNU tool for automatically creating Makefiles Name: automake -Version: %{api_version}.1 -Release: 8%{?dist} +# Any bump here requires libtool rebuild, rhbz#1813010 +Version: %{api_version}.5 +Release: 20%{?dist} -# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT -License: GPLv2+ and GFDL and Public Domain and MIT +# To help future rebase, the following licenses were seen in the following files/folders: +# usr/bin/* - GPL-2.0-or-later +# usr/share/aclocal-1.16/* - FSFULLR +# usr/share/automake-1.16: +# Automake/Getopt.pm - GPL-3.0-or-later +# Automake/* - GPL-2.0-or-later +# am/* - GPL-2.0-or-later +# INSTALL - FSFAP +# install-sh - X11 AND LicenseRef-Fedora-Public-Domain (added by autoconf) +# mkinstalldirs - LicenseRef-Fedora-Public-Domain +# config.{guess,sub} - GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 +# texinfo.tex - GPL-3.0-or-later WITH Texinfo-exception +# * - GPL-2.0-or-later WITH Autoconf-exception-generic +# usr/share/doc/automake: +# {NEWS,README} - GPL-2.0-or-later +# amhello-1.0.tar: +# src/Makefile.in - FSFULLRWD +# src/* - FSFUL +# {Makefile.in,aclocal.m4} - FSFULLRWD +# {Makefile.am,configure,configure.ac} - FSFUL +# {compile,depcomp,missing} - GPL-2.0-or-later WITH Autoconf-exception-generic +# install-sh - X11 AND LicenseRef-Fedora-Public-Domain (added by autoconf) +# usr/share/info: +# * - GFDL-1.3-or-later +# usr/share/man/man1/*: generated from usr/bin/{aclocal,automake} using help2man +License: GPL-2.0-or-later AND GPL-2.0-or-later WITH Autoconf-exception-generic AND GPL-3.0-or-later AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-or-later WITH Texinfo-exception AND GFDL-1.3-or-later AND FSFAP AND FSFUL AND FSFULLR AND FSFULLRWD AND X11 AND LicenseRef-Fedora-Public-Domain Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz -Source2: http://git.savannah.gnu.org/cgit/config.git/plain/config.sub -Source3: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess -# Keep those patches in 'git format-patch' format (with docs). +# ~> downstream +# The patch is only made necessary due to fedora specific changes +# which lead to .package_note-automake-1.16.5-3.fc36.x86_64.ld +# being inserted in build logs, breaking the original grep instruction +Patch0: fort2.patch +# From upstream: ed1368e8803e8934a8bbab52a38753484dba2a37 +Patch1: 0001-test-avoid-apostrophe-in-test-document.patch +# From upstream: 2a9908da9dbc075ee6c4e853cf3be0365b15f202 +Patch2: 0001-tests-Fix-type-defaults-error-in-link_cond-due-to-ma.patch +# Proposed upstream: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59993#23 +Patch3: v2-0002-tests-Fix-implicit-function-declaration-errors.patch +# Proposed upstream: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60962#5 +Patch4: v3-0003-tests-Fix-implicit-function-declaration-in-ax-dep.patch +# Proposed upstream: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59994#29 +Patch5: v2-0001-tests-Don-t-try-to-prevent-flex-to-include-unistd.patch -%if %{with check} && !%{without automake_enables_optional_test} -Patch0: automake-1.15-disable-vala-tests.patch -%endif +# From upstream: 6d6fc91c472fd84bd71a1b012fa9ab77bd94efea +# Reveals failures due to C99 porting that wouldn't be seen otherwise +Patch6: 0001-tests-depcomp-ensure-make_ok-fails-when-run_make-fai.patch -# BZ#1759942 -# automake bug#31222 - Don't use '\n' in sed substitution -# http://git.savannah.gnu.org/cgit/automake.git/commit/?id=a348d830659fffd2cfc42994524783b07e69b4b5 -Patch1: automake-1.16-pep3147-tweak-fix.patch +# From upstream: ab347652df9ff8f65ba1be6aaa357cf3c2b16dca +Patch7: 0001-python-support-noinst_PYTHON-preceding-foo_PYTHON.patch -# BZ#2209821 -# Backport fixes for automake bugs 44239 and 53530 -Patch2: automake-1.16.1-python-version-multiple-digits.patch -Patch3: 0001-python-add-3.10-3.15-to-the-version-search-list.patch +# From upstream: f1112a88d2361eb2ba5cedf49995ac75879059d9 +Patch8: 0001-test-another-check-for-PEP-3147-induced-by-Python-3..patch URL: http://www.gnu.org/software/automake/ Requires: autoconf >= 2.65 @@ -59,14 +103,26 @@ BuildArch: noarch # for better tests coverage: %if %{with check} %if %{with automake_enables_optional_test} -BuildRequires: automake libtool gettext-devel flex bison texinfo-tex texlive-dvips -BuildRequires: java-devel-openjdk gcc-gfortran -BuildRequires: dejagnu expect emacs vala -BuildRequires: cscope ncompress sharutils +BuildRequires: automake +BuildRequires: bison +BuildRequires: cscope +BuildRequires: dejagnu +BuildRequires: emacs +BuildRequires: expect +BuildRequires: flex +BuildRequires: gcc-gfortran +BuildRequires: gettext-devel +BuildRequires: libtool +BuildRequires: sharutils +BuildREquires: texlive-dvips +BuildRequires: texinfo-tex +BuildRequires: vala %if !0%{?rhel:1} -BuildRequires: lzip -BuildRequires: gcc-objc gcc-objc++ +BuildRequires: gcc-objc +BuildRequires: gcc-objc++ BuildRequires: imake +BuildRequires: lzip +BuildRequires: ncompress %endif %endif %endif @@ -90,24 +146,19 @@ Makefiles. autoreconf -iv %endif -for file in %SOURCE2 %SOURCE3; do - for dest in $(find -name "$(basename "$file")"); do - cp "$file" "$dest" - done -done - %build -# disable replacing config.guess and config.sub from redhat-rpm-config -%global _configure_gnuconfig_hack 0 +# redhat-rpm-config package, which provides this configure macro, will overwrite +# the config.sub and config.guess files intentionally. The automake maintainer +# needs to check that those files are provided up to date. %configure -make %{?_smp_mflags} +%make_build cp m4/acdir/README README.aclocal cp contrib/multilib/README README.multilib %install -make install DESTDIR=%{buildroot} +%make_install %check @@ -132,12 +183,116 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \ %changelog -* Wed Jun 28 2023 Frederic Berat - 1.16.1-8 -- Fix support for detection of python 3.1x (RHBZ#2209821) +* Wed Nov 27 2024 Frederic Berat - 1.16.5-20 +- test: another check for PEP-3147 induced by Python 3.12.1 (RHEL-66594) -* Tue May 05 2020 Patrik Novotný - 1.16.1-7 +* Tue Nov 26 2024 Frederic Berat - 1.16.5-19 +- Filter ncompress out for rhel (RHEL-59969) +- Fix pep3147_tweak regression (RHEL-59974) + +* Tue Oct 29 2024 Troy Dawson - 1.16.5-18 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.16.5-17 +- Bump release for June 2024 mass rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.16.5-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.16.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Aug 07 2023 Frederic Berat - 1.16.5-14 +- Migrate to SPDX licenses (#2222090) + +* Wed Jul 19 2023 Fedora Release Engineering - 1.16.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Feb 14 2023 Frederic Berat - 1.16.5-12 +- Port to modern C: various fixes + +* Fri Jan 20 2023 Frederic Berat - 1.16.5-11 +- Fix test failure due to texinfo 7.0 update + +* Wed Jan 18 2023 Fedora Release Engineering - 1.16.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Aug 03 2022 Frederic Berat - 1.16.5-9 +- Fix tests environment failures due to LDFLAGS being set globally +- Remove ExclusiveArch as there is no java dependency anymore + +* Wed Jul 20 2022 Fedora Release Engineering - 1.16.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 12 2022 Frederic Berat - 1.16.5-7 +- Remove java-devel from test related BuildRequires + +* Fri Jul 08 2022 Jiri Vanek - 1.16.5-6 +- Rebuilt for Drop i686 JDKs + +* Tue May 17 2022 Frederic Berat - 1.16.5-5 +- Fix fort2.sh test +- Remove external config.sub and config.guess as they are overwritten anyway + +* Mon Feb 07 2022 Frederic Berat - 1.16.5-4 +- Switch to java-devel as a build requirement (#2051135) + +* Sat Feb 05 2022 Jiri Vanek - 1.16.5-3 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.16.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 04 2021 Ondrej Dubaj - 1.16.5-1 +- Rebase to upstream version 1.16.5 + +* Tue Jul 27 2021 Ondrej Dubaj - 1.16.4-1 +- Rebase to upstream version 1.16.4 + +* Tue Jul 27 2021 Ondrej Dubaj - 1.16.3-1 +- Rebase to upstream version 1.16.3 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.16.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.16.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Oct 22 2020 Miro Hrončok - 1.16.2-3 +- Support multiple digits in Python version, e.g. Python 3.10 +- Fixes: rhbz#1889732 + +* Mon Jul 27 2020 Fedora Release Engineering - 1.16.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Apr 21 2020 Patrik Novotný - 1.16.2-1 +- Rebase to upstream version 1.16.2 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.16.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.16.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 18 2019 Patrik Novotný - 1.16.1-12 +- Fix patch for pep3147 tweak + +* Tue Jun 04 2019 Patrik Novotný - 1.16.1-11 - Upstream patch fixing automake bug#31222 +* Mon May 13 2019 Jakub Janco - 1.16.1-10 +- do not mangle shebang in files which are part of bootstraped project + +* Thu Jan 31 2019 Fedora Release Engineering - 1.16.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Oct 12 2018 Pavel Raiskup - 1.16.1-8 +- split BR to separate lines, use %%make_* macros + +* Mon Sep 17 2018 Pavel Raiskup - 1.16.1-7 +- update config.{guess,sub} to gnuconfig git HEAD + * Wed Aug 15 2018 Pavel Raiskup - 1.16.1-6 - BR imake for tests only on Fedora diff --git a/fort2.patch b/fort2.patch new file mode 100644 index 0000000..2f7404b --- /dev/null +++ b/fort2.patch @@ -0,0 +1,16 @@ +diff -r -U5 automake-1.16.5.old/t/fort2.sh automake-1.16.5/t/fort2.sh +--- automake-1.16.5.old/t/fort2.sh 2022-05-16 15:12:39.683825720 +0200 ++++ automake-1.16.5/t/fort2.sh 2022-05-16 15:12:53.495805448 +0200 +@@ -80,11 +80,11 @@ + grep ' fake-fc .* --@08 .* greets\.f08 ' out + grep ' fake-fc .* --@08 .* sub/bonjour\.f08 ' out + grep ' fake-fc .* --gby .* --@95 .*[` ]bye\.f95 ' out + grep ' fake-fc .* --gby .* --@90 .*[` ]sub/baz\.f90 ' out + +-test $(grep -c '.*--gby.*\.f' out) -eq 2 ++test $(grep -cE '.*--gby.*bye\.f95|--gby.*baz\.f90' out) -eq 2 + + $EGREP 'fake-fc.*--@(95|03|08).*\.f90' out && exit 1 + $EGREP 'fake-fc.*--@(90|03|08).*\.f95' out && exit 1 + $EGREP 'fake-fc.*--@(90|95|08).*\.f03' out && exit 1 + $EGREP 'fake-fc.*--@(95|95|03).*\.f08' out && exit 1 diff --git a/sources b/sources new file mode 100644 index 0000000..6c2c9d1 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (automake-1.16.5.tar.xz) = 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 diff --git a/v2-0001-tests-Don-t-try-to-prevent-flex-to-include-unistd.patch b/v2-0001-tests-Don-t-try-to-prevent-flex-to-include-unistd.patch new file mode 100644 index 0000000..368b88d --- /dev/null +++ b/v2-0001-tests-Don-t-try-to-prevent-flex-to-include-unistd.patch @@ -0,0 +1,1184 @@ +From d67b6386552672527cb6048cc5f0c08cac9423a5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= +Date: Thu, 8 Dec 2022 10:12:56 +0100 +Subject: [PATCH v2] tests: Don't try to prevent flex to include unistd.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +In-Reply-To: <20221212070752.1635797-1-fberat@redhat.com> + +Hello, + +Changes since v1: + - The "--never-interactive" option is added to AM_LFLAGS whenever a + yacc or lex test needs to execute make. + +Since there is quite a lot of files being modified, please review carefully. +Hopefully, I didn't forget anything, nor edited files that were not needed, +multiple sets of eyes may be useful here. + +-- 8< -- + +This patch is related to an effort to prepare Automake for future +GCC/Clang versions which set c99 as default standard to be used. + +Future version of flex make the "NO_UNISTD" flag a no-op, and include +unistd.h by default. + +In current version of flex, not having this header leads to implicit +function declarations that are not compatible with c99 standard. + +On top of that, while flex dedicated test were having this macro set, +the yacc ones didn't have it despise their use of Flex. + +For consistency, all the YACC/Flex related tests now have the +"--never-interactive" option set in AM_LFLAGS. + +Modified files: + * t/cond35.sh + * t/lex-clean-cxx.sh + * t/lex-clean.sh + * t/lex-depend-cxx.sh + * t/lex-depend.sh + * t/lex-header.sh + * t/lex-lib-external.sh + * t/lex-lib.sh + * t/lex-libobj.sh + * t/lex-line.sh + * t/lex-multiple.sh + * t/lex-nodist.sh + * t/lex-noyywrap.sh + * t/lex-pr204.sh + * t/lex-subobj-nodep.sh + * t/lex3.sh + * t/lex5.sh + * t/lexvpath.sh + * t/silent-lex.sh + * t/silent-many-languages.sh + * t/silent-yacc-headers.sh + * t/silent-yacc.sh + * t/subpkg-yacc.sh + * t/suffix10.tap + * t/yacc-auxdir.sh + * t/yacc-basic.sh + * t/yacc-bison-skeleton-cxx.sh + * t/yacc-bison-skeleton.sh + * t/yacc-clean-cxx.sh + * t/yacc-clean.sh + * t/yacc-cxx-grepping.sh + * t/yacc-cxx.sh + * t/yacc-d-basic.sh + * t/yacc-d-cxx.sh + * t/yacc-d-vpath.sh + * t/yacc-deleted-headers.sh + * t/yacc-depend.sh + * t/yacc-depend2.sh + * t/yacc-dist-nobuild-subdir.sh + * t/yacc-dist-nobuild.sh + * t/yacc-dry.sh + * t/yacc-grepping.sh + * t/yacc-grepping2.sh + * t/yacc-headers-and-dist-pr47.sh + * t/yacc-line.sh + * t/yacc-misc.sh + * t/yacc-mix-c-cxx.sh + * t/yacc-nodist.sh + * t/yacc-pr204.sh + * t/yacc-subdir.sh + * t/yacc-vpath.sh + * t/yacc-weirdnames.sh + * t/yflags-cmdline-override.sh + * t/yflags-cxx.sh + * t/yflags-d-false-positives.sh + * t/yflags-force-conditional.sh + * t/yflags-force-override.sh + * t/yflags-var-expand.sh + * t/yflags.sh +--- + t/cond35.sh | 4 +--- + t/lex-clean-cxx.sh | 4 ++-- + t/lex-clean.sh | 5 ++--- + t/lex-depend-cxx.sh | 4 ++-- + t/lex-depend.sh | 5 ++--- + t/lex-header.sh | 6 ++---- + t/lex-lib-external.sh | 5 ++--- + t/lex-lib.sh | 5 ++--- + t/lex-libobj.sh | 5 ++--- + t/lex-line.sh | 7 ++++--- + t/lex-multiple.sh | 7 +++---- + t/lex-nodist.sh | 5 ++--- + t/lex-noyywrap.sh | 5 ++--- + t/lex-pr204.sh | 5 ++--- + t/lex-subobj-nodep.sh | 5 ++--- + t/lex3.sh | 5 ++--- + t/lex5.sh | 4 +--- + t/lexvpath.sh | 11 ++--------- + t/silent-lex.sh | 7 ++++--- + t/silent-many-languages.sh | 1 + + t/silent-yacc-headers.sh | 1 + + t/silent-yacc.sh | 4 ++++ + t/subpkg-yacc.sh | 2 ++ + t/suffix10.tap | 2 ++ + t/yacc-auxdir.sh | 4 ++++ + t/yacc-basic.sh | 2 ++ + t/yacc-bison-skeleton-cxx.sh | 2 ++ + t/yacc-bison-skeleton.sh | 2 ++ + t/yacc-clean-cxx.sh | 2 ++ + t/yacc-clean.sh | 2 ++ + t/yacc-cxx-grepping.sh | 2 ++ + t/yacc-cxx.sh | 2 ++ + t/yacc-d-basic.sh | 2 ++ + t/yacc-d-cxx.sh | 2 ++ + t/yacc-d-vpath.sh | 2 ++ + t/yacc-deleted-headers.sh | 2 ++ + t/yacc-depend.sh | 2 ++ + t/yacc-depend2.sh | 2 ++ + t/yacc-dist-nobuild-subdir.sh | 2 ++ + t/yacc-dist-nobuild.sh | 2 ++ + t/yacc-dry.sh | 2 ++ + t/yacc-grepping.sh | 2 ++ + t/yacc-grepping2.sh | 2 ++ + t/yacc-headers-and-dist-pr47.sh | 2 ++ + t/yacc-line.sh | 4 ++++ + t/yacc-misc.sh | 2 ++ + t/yacc-mix-c-cxx.sh | 2 ++ + t/yacc-nodist.sh | 2 ++ + t/yacc-pr204.sh | 2 ++ + t/yacc-subdir.sh | 2 ++ + t/yacc-vpath.sh | 2 ++ + t/yacc-weirdnames.sh | 2 ++ + t/yflags-cmdline-override.sh | 2 ++ + t/yflags-cxx.sh | 2 ++ + t/yflags-d-false-positives.sh | 2 ++ + t/yflags-force-conditional.sh | 2 ++ + t/yflags-force-override.sh | 2 ++ + t/yflags-var-expand.sh | 2 ++ + t/yflags.sh | 2 ++ + 59 files changed, 125 insertions(+), 63 deletions(-) + +diff --git a/t/cond35.sh b/t/cond35.sh +index dc3b8aae9..8b044644e 100644 +--- a/t/cond35.sh ++++ b/t/cond35.sh +@@ -30,6 +30,7 @@ EOF + + cat > Makefile.am <<'EOF' + AM_YFLAGS = -d ++AM_LFLAGS = --never-interactive + + BUILT_SOURCES = tparse.h + +@@ -58,9 +59,6 @@ $FGREP 'tparse.h' Makefile.in # For debugging. + test $($FGREP -c 'tparse.h:' Makefile.in) -eq 1 + + cat > tscan.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "END" return EOF; + %% +diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh +index 3632d5c87..9f628accd 100644 +--- a/t/lex-clean-cxx.sh ++++ b/t/lex-clean-cxx.sh +@@ -29,6 +29,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar baz qux + + foo_SOURCES = mainfoo.cc parsefoo.lxx +@@ -55,8 +57,6 @@ cat > parsefoo.lxx << 'END' + %{ + #define YY_DECL int yylex (void) + extern "C" YY_DECL; +-#define YY_NO_UNISTD_H 1 +-int isatty (int fd) { return 0; } + %} + %% + "GOOD" return EOF; +diff --git a/t/lex-clean.sh b/t/lex-clean.sh +index 1ee7d8f5b..4668e97c7 100644 +--- a/t/lex-clean.sh ++++ b/t/lex-clean.sh +@@ -29,6 +29,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar baz qux + + foo_SOURCES = main.c lexer.l +@@ -52,9 +54,6 @@ LDADD = $(LEXLIB) + END + + cat > lexer.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "GOOD" return EOF; + . +diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh +index 60615a54e..51bd67b7b 100644 +--- a/t/lex-depend-cxx.sh ++++ b/t/lex-depend-cxx.sh +@@ -27,6 +27,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + noinst_PROGRAMS = joe moe + joe_SOURCES = joe.ll + moe_SOURCES = moe.l++ +@@ -48,8 +50,6 @@ cat > joe.ll << 'END' + %{ + #define YY_DECL int yylex (void) + extern "C" YY_DECL; +-#define YY_NO_UNISTD_H 1 +-int isatty (int fd) { return 0; } + %} + %% + "foo" return EOF; +diff --git a/t/lex-depend.sh b/t/lex-depend.sh +index 16f937ef1..68cc5ee7b 100644 +--- a/t/lex-depend.sh ++++ b/t/lex-depend.sh +@@ -27,6 +27,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = zoo + zoo_SOURCES = joe.l + LDADD = $(LEXLIB) +@@ -42,9 +44,6 @@ test-obj-updated: joe.$(OBJEXT) + END + + cat > joe.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "foo" return EOF; + . +diff --git a/t/lex-header.sh b/t/lex-header.sh +index 22567642e..48b42457a 100644 +--- a/t/lex-header.sh ++++ b/t/lex-header.sh +@@ -33,6 +33,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo + foo_SOURCES = lexer.l main.c mylex.h + foo_LFLAGS = --header-file=mylex.h +@@ -45,9 +47,6 @@ END + + cat > lexer.l << 'END' + %option noyywrap +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "GOOD" return EOF; + . +@@ -55,7 +54,6 @@ cat > lexer.l << 'END' + END + + cat > main.c <<'END' +-#define YY_NO_UNISTD_H 1 + #include "mylex.h" + int main (void) + { +diff --git a/t/lex-lib-external.sh b/t/lex-lib-external.sh +index 85403612f..25ad2a39b 100644 +--- a/t/lex-lib-external.sh ++++ b/t/lex-lib-external.sh +@@ -28,6 +28,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = lexer + lexer_SOURCES = foo.l + lexer_LDADD = $(LEXLIB) +@@ -42,9 +44,6 @@ have-lexlib: + END + + cat > foo.l <<'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "GOOD" return EOF; + . +diff --git a/t/lex-lib.sh b/t/lex-lib.sh +index f0a0d37f6..7734fd228 100644 +--- a/t/lex-lib.sh ++++ b/t/lex-lib.sh +@@ -31,6 +31,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = lexer + lexer_SOURCES = foo.l + lexer_LDADD = $(LEXLIB) +@@ -47,9 +49,6 @@ int yywrap (void) + END + + cat > foo.l <<'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "END" return EOF; + . +diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh +index b26381fcf..6e36a98ed 100644 +--- a/t/lex-libobj.sh ++++ b/t/lex-libobj.sh +@@ -32,6 +32,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + noinst_PROGRAMS = foo + foo_SOURCES = foo.l + foo_LDADD = $(LEXLIB) $(LIBOBJS) +@@ -45,9 +47,6 @@ int yywrap (void) + END + + cat > foo.l <<'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "END" return EOF; + . +diff --git a/t/lex-line.sh b/t/lex-line.sh +index 340800ef2..5f9145847 100644 +--- a/t/lex-line.sh ++++ b/t/lex-line.sh +@@ -32,6 +32,8 @@ END + mkdir dir sub sub/dir + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + SUBDIRS = sub + bin_PROGRAMS = foo bar + LDADD = $(LEXLIB) +@@ -44,6 +46,8 @@ bar-quux.@OBJEXT@: bar-quux.c + END + + cat > sub/Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + AUTOMAKE_OPTIONS = subdir-objects + noinst_PROGRAMS = foo bar + ## We already used $(LEXLIB) above, so try @LEXLIB@ now. +@@ -57,9 +61,6 @@ dir/quux.@OBJEXT@: dir/quux.c + END + + cat > zardoz.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "END" return EOF; + . +diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh +index 9565bd6b8..6486a012f 100644 +--- a/t/lex-multiple.sh ++++ b/t/lex-multiple.sh +@@ -31,7 +31,9 @@ AC_PROG_RANLIB + AC_OUTPUT + END + +-cat > Makefile.am << 'END' ++cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = zardoz + + zardoz_SOURCES = main.c +@@ -72,9 +74,6 @@ int main (int argc, char *argv[]) + END + + cat > 0.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "VANILLA" { printf (":%s:\n", yytext); return 121; } + . { printf (":%s:\n", yytext); return 1; } +diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh +index 73e23a13e..d499aea7f 100644 +--- a/t/lex-nodist.sh ++++ b/t/lex-nodist.sh +@@ -31,6 +31,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + .PHONY: test-build test-dist + test-build: all + ls -l +@@ -45,9 +47,6 @@ check-local: test-build test-dist + lexer.l: + rm -f $@ $@-t + :; { : \ +- && echo '%{' \ +- && echo '#define YY_NO_UNISTD_H 1' \ +- && echo '%}' \ + && echo '%%' \ + && echo '"GOOD" return EOF;' \ + && echo '.'; \ +diff --git a/t/lex-noyywrap.sh b/t/lex-noyywrap.sh +index 1c61a1ab3..5ec68b9ba 100644 +--- a/t/lex-noyywrap.sh ++++ b/t/lex-noyywrap.sh +@@ -26,6 +26,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo + foo_SOURCES = foo.l + +@@ -37,9 +39,6 @@ END + + cat > foo.l << 'END' + %option noyywrap +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "GOOD" return EOF; + . +diff --git a/t/lex-pr204.sh b/t/lex-pr204.sh +index ebfaafef5..cbad1c266 100644 +--- a/t/lex-pr204.sh ++++ b/t/lex-pr204.sh +@@ -35,6 +35,8 @@ EOF + # The LEXER2 intermediate variable is there to make sure Automake + # matches 'nodist_' against the right variable name... + cat > Makefile.am << 'EOF' ++AM_LFLAGS = --never-interactive ++ + EXTRA_PROGRAMS = foo + LEXER2 = lexer2.l + nodist_foo_SOURCES = lexer.l $(LEXER2) +@@ -49,9 +51,6 @@ distdirtest: distdir + EOF + + cat > lexer.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "GOOD" return EOF; + . +diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh +index f8bb87a9c..8ef4d68b1 100644 +--- a/t/lex-subobj-nodep.sh ++++ b/t/lex-subobj-nodep.sh +@@ -28,6 +28,8 @@ END + + cat >Makefile.am <<\END + AUTOMAKE_OPTIONS = subdir-objects ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = p1 p2 + p1_SOURCES = sub1/s1.l + p2_SOURCES = sub2/s2.l +@@ -37,9 +39,6 @@ END + mkdir sub1 sub2 + + cat >sub1/s1.l <<\END +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "END" return EOF; + . +diff --git a/t/lex3.sh b/t/lex3.sh +index 41b87dc06..4a20f85da 100644 +--- a/t/lex3.sh ++++ b/t/lex3.sh +@@ -28,14 +28,13 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + noinst_PROGRAMS = foo + foo_SOURCES = foo.l + END + + cat > foo.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "GOOD" return EOF; + . +diff --git a/t/lex5.sh b/t/lex5.sh +index 3d84d9b41..687903e65 100644 +--- a/t/lex5.sh ++++ b/t/lex5.sh +@@ -28,6 +28,7 @@ END + cat > Makefile.am << 'END' + AUTOMAKE_OPTIONS = subdir-objects + LDADD = @LEXLIB@ ++AM_LFLAGS = --never-interactive + + bin_PROGRAMS = foo/foo + foo_foo_SOURCES = foo/foo.l +@@ -36,9 +37,6 @@ END + mkdir foo + + cat > foo/foo.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "END" return EOF; + . +diff --git a/t/lexvpath.sh b/t/lexvpath.sh +index 5185a1f71..d064fd2bd 100644 +--- a/t/lexvpath.sh ++++ b/t/lexvpath.sh +@@ -37,6 +37,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo + foo_SOURCES = lexer.l foo.c + LDADD = $(LEXLIB) +@@ -44,9 +46,6 @@ END + + # Original lexer, with a "foobar" comment + cat > lexer.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "END" return EOF; + . +@@ -89,9 +88,6 @@ $sleep + + # New lexer, with 'fubar' comment. + cat > ../lexer.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "END" return EOF; + . +@@ -112,9 +108,6 @@ $sleep + + # New lexer, with 'maude' comment. + cat > ../lexer.l << 'END' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "END" return EOF; + . +diff --git a/t/silent-lex.sh b/t/silent-lex.sh +index cfe1a9b5d..e424afc38 100644 +--- a/t/silent-lex.sh ++++ b/t/silent-lex.sh +@@ -28,6 +28,8 @@ AC_OUTPUT + EOF + + cat > Makefile.am <<'EOF' ++AM_LFLAGS = --never-interactive ++ + # Need generic and non-generic rules. + bin_PROGRAMS = foo1 foo2 + foo1_SOURCES = foo.l +@@ -40,6 +42,8 @@ EOF + + cat > sub/Makefile.am <<'EOF' + AUTOMAKE_OPTIONS = subdir-objects ++AM_LFLAGS = --never-interactive ++ + # Need generic and non-generic rules. + bin_PROGRAMS = bar1 bar2 + bar1_SOURCES = bar.l +@@ -50,9 +54,6 @@ LDADD = $(LEXLIB) + EOF + + cat > foo.l <<'EOF' +-%{ +-#define YY_NO_UNISTD_H 1 +-%} + %% + "END" return EOF; + . +diff --git a/t/silent-many-languages.sh b/t/silent-many-languages.sh +index 4edb46884..85773d339 100644 +--- a/t/silent-many-languages.sh ++++ b/t/silent-many-languages.sh +@@ -151,6 +151,7 @@ ba2_YFLAGS = -v + ba2_LFLAGS = -n + ba2_LDADD = $(LEXLIB) + AM_YFLAGS = -d ++AM_LFLAGS = --never-interactive + BUILT_SOURCES = baz6.h + EOF + +diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh +index 98ae45b8a..f64342c82 100644 +--- a/t/silent-yacc-headers.sh ++++ b/t/silent-yacc-headers.sh +@@ -31,6 +31,7 @@ EOF + cat > Makefile.am <<'EOF' + # Need generic and non-generic rules. + AM_YFLAGS = -d ++AM_LFLAGS = --never-interactive + bin_PROGRAMS = foo bar + foo_SOURCES = parse.y + bar_SOURCES = $(foo_SOURCES) +diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh +index 9645aff83..d89ff49a7 100644 +--- a/t/silent-yacc.sh ++++ b/t/silent-yacc.sh +@@ -29,6 +29,8 @@ AC_OUTPUT + EOF + + cat > Makefile.am <<'EOF' ++AM_LFLAGS = --never-interactive ++ + # Need generic and non-generic rules. + bin_PROGRAMS = foo1 foo2 + foo1_SOURCES = foo.y +@@ -40,6 +42,8 @@ EOF + + cat > sub/Makefile.am <<'EOF' + AUTOMAKE_OPTIONS = subdir-objects ++AM_LFLAGS = --never-interactive ++ + # Need generic and non-generic rules. + bin_PROGRAMS = bar1 bar2 + bar1_SOURCES = bar.y +diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh +index edd14532b..782ee0957 100644 +--- a/t/subpkg-yacc.sh ++++ b/t/subpkg-yacc.sh +@@ -61,6 +61,8 @@ AC_OUTPUT + EOF + + cat >lib/Makefile.am <<'EOF' ++AM_LFLAGS = --never-interactive ++ + noinst_LIBRARIES = liblib.a + liblib_a_SOURCES = src/x.c foo.y + EXTRA_liblib_a_SOURCES = bar.y +diff --git a/t/suffix10.tap b/t/suffix10.tap +index 3869d07fd..8d3dc1756 100644 +--- a/t/suffix10.tap ++++ b/t/suffix10.tap +@@ -31,6 +31,8 @@ AC_OUTPUT + EOF + + cat >Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + lib_LTLIBRARIES = libfoo.la + libfoo_la_SOURCES = foo.x_ + .x_.y: +diff --git a/t/yacc-auxdir.sh b/t/yacc-auxdir.sh +index be8ac4fd4..f6ff7de48 100644 +--- a/t/yacc-auxdir.sh ++++ b/t/yacc-auxdir.sh +@@ -35,12 +35,16 @@ cat > Makefile.am << 'END' + SUBDIRS = sub + bin_PROGRAMS = foo + AM_YFLAGS = -d ++AM_LFLAGS = --never-interactive ++ + foo_SOURCES = foo.y + END + + cat > sub/Makefile.am << 'END' + bin_PROGRAMS = bar + AM_YFLAGS = -d ++AM_LFLAGS = --never-interactive ++ + bar_SOURCES = bar.y main.c + END + +diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh +index b7a35bd39..51ee5f6a3 100644 +--- a/t/yacc-basic.sh ++++ b/t/yacc-basic.sh +@@ -27,6 +27,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar + foo_SOURCES = parse.y foo.c + bar_SOURCES = $(foo_SOURCES) +diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh +index bded1a34f..da76238fa 100644 +--- a/t/yacc-bison-skeleton-cxx.sh ++++ b/t/yacc-bison-skeleton-cxx.sh +@@ -27,6 +27,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = zardoz + zardoz_SOURCES = zardoz.yy foo.cc + +diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh +index b77b29f1e..11b64b831 100644 +--- a/t/yacc-bison-skeleton.sh ++++ b/t/yacc-bison-skeleton.sh +@@ -31,6 +31,8 @@ cat > Makefile.am << 'END' + bin_PROGRAMS = zardoz + zardoz_SOURCES = zardoz.y foo.c + AM_YFLAGS = -d --skeleton glr.c ++AM_LFLAGS = --never-interactive ++ + BUILT_SOURCES = zardoz.h + END + +diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh +index d12e02308..71eb4f315 100644 +--- a/t/yacc-clean-cxx.sh ++++ b/t/yacc-clean-cxx.sh +@@ -39,6 +39,8 @@ END + mkdir sub1 sub2 + + cat > sub1/Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar baz qux + + foo_SOURCES = mainfoo.cc parsefoo.yxx +diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh +index 0baf0afd8..d0f793843 100644 +--- a/t/yacc-clean.sh ++++ b/t/yacc-clean.sh +@@ -38,6 +38,8 @@ END + mkdir sub1 sub2 + + cat > sub1/Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar baz qux + + foo_SOURCES = main.c parse.y +diff --git a/t/yacc-cxx-grepping.sh b/t/yacc-cxx-grepping.sh +index 7b3a6bc5e..e094d5f16 100644 +--- a/t/yacc-cxx-grepping.sh ++++ b/t/yacc-cxx-grepping.sh +@@ -27,6 +27,8 @@ AC_PROG_YACC + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar baz qux + foo_SOURCES = foo.y++ + bar_SOURCES = bar.ypp +diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh +index 1bf75a975..52fca8c01 100644 +--- a/t/yacc-cxx.sh ++++ b/t/yacc-cxx.sh +@@ -28,6 +28,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo1 foo2 foo3 foo4 + foo1_SOURCES = parse1.yy foo.cc + foo2_SOURCES = parse2.y++ bar.c++ +diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh +index fe80a0888..166111fdb 100644 +--- a/t/yacc-d-basic.sh ++++ b/t/yacc-d-basic.sh +@@ -35,6 +35,8 @@ END + mkdir foo bar baz + + cat > foo/Makefile.am <<'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = zardoz + zardoz_SOURCES = parse.y main.c + .PHONY: echo-distcom +diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh +index 56f43c940..5f9a09a46 100644 +--- a/t/yacc-d-cxx.sh ++++ b/t/yacc-d-cxx.sh +@@ -67,6 +67,8 @@ mkdir foo bar baz qux baz/sub + + # These makefiles will be extended later. + cat > Makefile.am <<'END' ++AM_LFLAGS = --never-interactive ++ + .PHONY: echo-distcom + echo-distcom: + @echo ' ' $(DIST_COMMON) ' ' +diff --git a/t/yacc-d-vpath.sh b/t/yacc-d-vpath.sh +index dced4818f..3dcf17ade 100644 +--- a/t/yacc-d-vpath.sh ++++ b/t/yacc-d-vpath.sh +@@ -32,6 +32,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo + foo_SOURCES = parse.y foo.c + AM_YFLAGS = -d +diff --git a/t/yacc-deleted-headers.sh b/t/yacc-deleted-headers.sh +index c3fdbeee4..8c27dcefb 100644 +--- a/t/yacc-deleted-headers.sh ++++ b/t/yacc-deleted-headers.sh +@@ -26,6 +26,8 @@ AC_OUTPUT + END + + cat > Makefile.am <<'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = p1 p2 p3 p4 + # The order in which files are listed in the p*_SOURCES variables + # below is significant, since it causes make failures whenever +diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh +index cf544359f..d1e09bc39 100644 +--- a/t/yacc-depend.sh ++++ b/t/yacc-depend.sh +@@ -29,6 +29,8 @@ END + cat > Makefile.am << 'END' + bin_PROGRAMS = foo + AM_YFLAGS = -d ++AM_LFLAGS = --never-interactive ++ + foo_SOURCES = foo.y main.c + BUILT_SOURCES = foo.h + END +diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh +index a61e4957d..a52d4489f 100644 +--- a/t/yacc-depend2.sh ++++ b/t/yacc-depend2.sh +@@ -28,6 +28,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo + AM_YFLAGS = -d + foo_SOURCES = foo.y main.c +diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh +index d1788811f..56320fe48 100644 +--- a/t/yacc-dist-nobuild-subdir.sh ++++ b/t/yacc-dist-nobuild-subdir.sh +@@ -49,6 +49,8 @@ END + + cat > Makefile.am <<'END' + AUTOMAKE_OPTIONS = subdir-objects ++AM_LFLAGS = --never-interactive ++ + noinst_PROGRAMS = foo bar + foo_SOURCES = sub/parse.y + bar_SOURCES = $(foo_SOURCES) +diff --git a/t/yacc-dist-nobuild.sh b/t/yacc-dist-nobuild.sh +index a30fefec2..71be0d52c 100644 +--- a/t/yacc-dist-nobuild.sh ++++ b/t/yacc-dist-nobuild.sh +@@ -28,6 +28,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foobar zardoz + foobar_SOURCES = parse.y main.c + zardoz_SOURCES = $(foobar_SOURCES) +diff --git a/t/yacc-dry.sh b/t/yacc-dry.sh +index 9b08d3863..6500ba811 100644 +--- a/t/yacc-dry.sh ++++ b/t/yacc-dry.sh +@@ -26,6 +26,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + AM_YFLAGS = -d + bin_PROGRAMS = foo + foo_SOURCES = foo.c parse.y +diff --git a/t/yacc-grepping.sh b/t/yacc-grepping.sh +index b0cf91353..67381ba89 100644 +--- a/t/yacc-grepping.sh ++++ b/t/yacc-grepping.sh +@@ -35,6 +35,8 @@ END + $ACLOCAL + + cat > Makefile.am <<'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = zardoz + zardoz_SOURCES = zardoz.y + END +diff --git a/t/yacc-grepping2.sh b/t/yacc-grepping2.sh +index 159dd3e15..4af321fbe 100644 +--- a/t/yacc-grepping2.sh ++++ b/t/yacc-grepping2.sh +@@ -25,6 +25,8 @@ AC_PROG_YACC + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = maude + maude_SOURCES = sub/maude.y + END +diff --git a/t/yacc-headers-and-dist-pr47.sh b/t/yacc-headers-and-dist-pr47.sh +index 57c8251ad..74ec525f9 100644 +--- a/t/yacc-headers-and-dist-pr47.sh ++++ b/t/yacc-headers-and-dist-pr47.sh +@@ -30,6 +30,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo + foo_SOURCES = foo.y + AM_YFLAGS = -d +diff --git a/t/yacc-line.sh b/t/yacc-line.sh +index e7a4d6244..2319c9791 100644 +--- a/t/yacc-line.sh ++++ b/t/yacc-line.sh +@@ -32,6 +32,8 @@ END + mkdir dir sub sub/dir + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + SUBDIRS = sub + bin_PROGRAMS = foo bar + AM_YFLAGS = -d +@@ -45,6 +47,8 @@ END + + cat > sub/Makefile.am << 'END' + AUTOMAKE_OPTIONS = subdir-objects ++AM_LFLAGS = --never-interactive ++ + noinst_PROGRAMS = foo bar + foo_YFLAGS = -d + foo_SOURCES = zardoz.y +diff --git a/t/yacc-misc.sh b/t/yacc-misc.sh +index 2bfb0c55e..fcc19aa49 100644 +--- a/t/yacc-misc.sh ++++ b/t/yacc-misc.sh +@@ -26,6 +26,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar + foo_SOURCES = parse.y foo.c + bar_SOURCES = bar.y foo.c +diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh +index a73935c39..bb58bb6fa 100644 +--- a/t/yacc-mix-c-cxx.sh ++++ b/t/yacc-mix-c-cxx.sh +@@ -28,6 +28,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = c1 c2 cxx1 cxx2 cxx3 + AM_YFLAGS = -d + +diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh +index dbb86bdb2..8e5338e94 100644 +--- a/t/yacc-nodist.sh ++++ b/t/yacc-nodist.sh +@@ -31,6 +31,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + SUBDIRS = sub1 sub2 + .PHONY: test-build test-dist + test-build: all +diff --git a/t/yacc-pr204.sh b/t/yacc-pr204.sh +index 91882e4d7..89acb1ee0 100644 +--- a/t/yacc-pr204.sh ++++ b/t/yacc-pr204.sh +@@ -34,6 +34,8 @@ EOF + # sure Automake match 'nodist_' against the right + # variable name... + cat > Makefile.am << 'EOF' ++AM_LFLAGS = --never-interactive ++ + AM_YFLAGS = -d + EXTRA_PROGRAMS = foo + PARSE2 = parse2.y +diff --git a/t/yacc-subdir.sh b/t/yacc-subdir.sh +index df31a3c51..d6c3f0cc8 100644 +--- a/t/yacc-subdir.sh ++++ b/t/yacc-subdir.sh +@@ -28,6 +28,8 @@ END + + cat > Makefile.am << 'END' + AUTOMAKE_OPTIONS = subdir-objects ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo/foo + foo_foo_SOURCES = foo/parse.y + AM_YFLAGS = -d +diff --git a/t/yacc-vpath.sh b/t/yacc-vpath.sh +index 52d2c45bd..42044ecf2 100644 +--- a/t/yacc-vpath.sh ++++ b/t/yacc-vpath.sh +@@ -32,6 +32,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo + foo_SOURCES = parse.y foo.c + END +diff --git a/t/yacc-weirdnames.sh b/t/yacc-weirdnames.sh +index 60f199d2d..8397bc636 100644 +--- a/t/yacc-weirdnames.sh ++++ b/t/yacc-weirdnames.sh +@@ -27,6 +27,8 @@ AC_OUTPUT + END + + cat > Makefile.am << 'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar foo2 bar2 + + foo_SOURCES = parse.y.y +diff --git a/t/yflags-cmdline-override.sh b/t/yflags-cmdline-override.sh +index 37304645c..73982753a 100644 +--- a/t/yflags-cmdline-override.sh ++++ b/t/yflags-cmdline-override.sh +@@ -27,6 +27,8 @@ AC_OUTPUT + END + + cat > Makefile.am <<'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo + foo_SOURCES = foo.y + # A minor automake wart: automake doesn't generate code to clean +diff --git a/t/yflags-cxx.sh b/t/yflags-cxx.sh +index 9bd28b8ce..2596a95e3 100644 +--- a/t/yflags-cxx.sh ++++ b/t/yflags-cxx.sh +@@ -39,6 +39,8 @@ END + + cat > Makefile.am <<'END' + AUTOMAKE_OPTIONS = no-dependencies ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar + foo_SOURCES = main.cc foo.yy + bar_SOURCES = main.cc bar.y++ +diff --git a/t/yflags-d-false-positives.sh b/t/yflags-d-false-positives.sh +index 21efb2345..666dbe938 100644 +--- a/t/yflags-d-false-positives.sh ++++ b/t/yflags-d-false-positives.sh +@@ -26,6 +26,8 @@ END + $ACLOCAL + + cat > Makefile.am <<'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = zardoz foobar + zardoz_SOURCES = zardoz.y + foobar_SOURCES = foobar.y +diff --git a/t/yflags-force-conditional.sh b/t/yflags-force-conditional.sh +index 3f9a13293..976b6f782 100644 +--- a/t/yflags-force-conditional.sh ++++ b/t/yflags-force-conditional.sh +@@ -38,6 +38,8 @@ YACC=fake-yacc; export YACC + + cat > Makefile.am <<'END' + AUTOMAKE_OPTIONS = no-dependencies ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar + foo_SOURCES = foo.y main.c + bar_SOURCES = $(foo_SOURCES) +diff --git a/t/yflags-force-override.sh b/t/yflags-force-override.sh +index b1c36ef0f..7c865935b 100644 +--- a/t/yflags-force-override.sh ++++ b/t/yflags-force-override.sh +@@ -28,6 +28,8 @@ AC_OUTPUT + END + + cat > Makefile.am <<'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo + foo_SOURCES = foo.y + # Don't do this in a real-life Makefile.am! +diff --git a/t/yflags-var-expand.sh b/t/yflags-var-expand.sh +index 0e06e0d9c..bf34922a6 100644 +--- a/t/yflags-var-expand.sh ++++ b/t/yflags-var-expand.sh +@@ -29,6 +29,8 @@ END + $ACLOCAL + + cat > Makefile.am <<'END' ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar + foo_SOURCES = foo.y + bar_SOURCES = bar.y +diff --git a/t/yflags.sh b/t/yflags.sh +index 1f73776f8..2359a76b7 100644 +--- a/t/yflags.sh ++++ b/t/yflags.sh +@@ -39,6 +39,8 @@ END + + cat > Makefile.am <<'END' + AUTOMAKE_OPTIONS = no-dependencies ++AM_LFLAGS = --never-interactive ++ + bin_PROGRAMS = foo bar + foo_SOURCES = main.c foo.y + bar_SOURCES = main.c bar.y +-- +2.39.0 + diff --git a/v2-0002-tests-Fix-implicit-function-declaration-errors.patch b/v2-0002-tests-Fix-implicit-function-declaration-errors.patch new file mode 100644 index 0000000..b882e03 --- /dev/null +++ b/v2-0002-tests-Fix-implicit-function-declaration-errors.patch @@ -0,0 +1,265 @@ +From 38f4f6dcdb907e0006a8e83246e010d5d5cad98d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= +Date: Thu, 8 Dec 2022 10:09:14 +0100 +Subject: [PATCH v2 2/3] tests: Fix implicit function declaration errors +In-Reply-To: <20221212070554.1635775-3-fberat@redhat.com> + +Changes from v1: + Modifications to "t/ax/depcomp.sh" have been moved to a dedicated patch + +-- 8< -- + +This is related to an effort to prepare Automake for future GCC/Clang +versions which set c99 as default standard to be used. + +Function should be properly declared prior to use in order to be +compatible with c99 standard. +This is valid for both local functions and standard functions (as +printf). + +Modified files: + + * t/c-demo.sh + * t/cond35.sh + * t/dist-vs-built-sources.sh + * t/lex-clean.sh + * t/lex-multiple.sh + * t/lex-nodist.sh + * t/ltcond2.sh + * t/ltconv.sh + * t/subobj-clean-lt-pr10697.sh + * t/subobj-clean-pr10697.sh + * t/tags-pr12372.sh + * t/yacc-basic.sh + * t/yacc-clean.sh + * t/yacc-nodist.sh +--- + t/c-demo.sh | 1 + + t/cond35.sh | 2 ++ + t/dist-vs-built-sources.sh | 1 + + t/lex-clean.sh | 1 + + t/lex-multiple.sh | 4 ++++ + t/lex-nodist.sh | 2 ++ + t/ltcond2.sh | 2 ++ + t/ltconv.sh | 6 ++++++ + t/subobj-clean-lt-pr10697.sh | 10 +++++++++- + t/subobj-clean-pr10697.sh | 10 +++++++++- + t/tags-pr12372.sh | 3 ++- + t/yacc-basic.sh | 1 + + t/yacc-clean.sh | 4 ++++ + t/yacc-nodist.sh | 2 ++ + 14 files changed, 46 insertions(+), 3 deletions(-) + +diff --git a/t/c-demo.sh b/t/c-demo.sh +index 7e0e8d64f..d25bf214b 100644 +--- a/t/c-demo.sh ++++ b/t/c-demo.sh +@@ -113,6 +113,7 @@ test -f build-aux/compile # We have per-target flags on C sources. + ./configure --enable-dependency-tracking + + cat > src/main.c << 'END' ++#include + #include "foo.h" + #include "bar.h" + int main (void) +diff --git a/t/cond35.sh b/t/cond35.sh +index 215a22548..bad133970 100644 +--- a/t/cond35.sh ++++ b/t/cond35.sh +@@ -73,6 +73,8 @@ END + + cat > tparse.y << 'END' + %{ ++extern int yylex(void); ++ + void yyerror (const char *s) {} + %} + %token EOF +diff --git a/t/dist-vs-built-sources.sh b/t/dist-vs-built-sources.sh +index d038e66dd..db2776f9a 100644 +--- a/t/dist-vs-built-sources.sh ++++ b/t/dist-vs-built-sources.sh +@@ -41,6 +41,7 @@ foo_SOURCES = foo.c + END + + cat > foo.c << 'END' ++#include + #include "h.h" + int main (void) { printf ("%s\n", F); return 0; } + END +diff --git a/t/lex-clean.sh b/t/lex-clean.sh +index 5aa199338..e53da8fd2 100644 +--- a/t/lex-clean.sh ++++ b/t/lex-clean.sh +@@ -61,6 +61,7 @@ cat > lexer.l << 'END' + END + + cat > main.c << 'END' ++extern int yylex (void); + int main (void) + { + return yylex (); +diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh +index 2655b633e..bf119ec84 100644 +--- a/t/lex-multiple.sh ++++ b/t/lex-multiple.sh +@@ -56,6 +56,10 @@ cat > main.c << 'END' + #include + #include + ++extern int yylex (void); ++extern int foolex (void); ++extern int bar_lex (void); ++ + int main (int argc, char *argv[]) + { + if (argc != 2) +diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh +index 599539405..187dd5437 100644 +--- a/t/lex-nodist.sh ++++ b/t/lex-nodist.sh +@@ -62,6 +62,8 @@ CLEANFILES = $(nodist_prog_SOURCES) + END + + cat > main.c << 'END' ++extern int yylex (void); ++ + int main () + { + return yylex (); +diff --git a/t/ltcond2.sh b/t/ltcond2.sh +index 29244c9b3..7e7bcadc4 100644 +--- a/t/ltcond2.sh ++++ b/t/ltcond2.sh +@@ -73,6 +73,8 @@ void print (void) + END + + cat > main.c <<'END' ++extern void print(void); ++ + int main (void) + { + print(); +diff --git a/t/ltconv.sh b/t/ltconv.sh +index 2c4cc47a1..ec79ef80e 100644 +--- a/t/ltconv.sh ++++ b/t/ltconv.sh +@@ -91,6 +91,12 @@ echo 'int sub22 () { return 22; }' > sub2/sub22/sub22.c + + cat >test.c <<'EOF' + #include ++ ++extern int sub1 (void); ++extern int sub2 (void); ++extern int sub21 (void); ++extern int sub22 (void); ++ + int main () + { + if (1 != sub1 ()) +diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh +index bb656c43f..53fc02f09 100644 +--- a/t/subobj-clean-lt-pr10697.sh ++++ b/t/subobj-clean-lt-pr10697.sh +@@ -83,7 +83,15 @@ libfoo_la_SOURCES = \ + END + + mkdir sub1 sub2 +-echo 'int libmain (void)' > main.c ++ ++echo "/* Subobj clean: libtool case*/" > main.c ++for i in 1 2; do ++ for j in a b c d e f; do ++ echo "extern void $j$i (void);" >> main.c ++ done ++done ++ ++echo 'int libmain (void)' >> main.c + echo '{' >> main.c + for i in 1 2; do + for j in a b c d e f; do +diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh +index f77de8c92..a7f97f6d1 100644 +--- a/t/subobj-clean-pr10697.sh ++++ b/t/subobj-clean-pr10697.sh +@@ -81,7 +81,15 @@ foo_SOURCES = \ + END + + mkdir sub1 sub2 +-echo 'int main (void)' > main.c ++ ++echo "/* Subobj clean: generic case*/" > main.c ++for i in 1 2; do ++ for j in a b c d e f; do ++ echo "extern void $j$i (void);" >> main.c ++ done ++done ++ ++echo 'int main (void)' >> main.c + echo '{' >> main.c + for i in 1 2; do + for j in a b c d e f; do +diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh +index b9c022f70..1a9e1e026 100644 +--- a/t/tags-pr12372.sh ++++ b/t/tags-pr12372.sh +@@ -53,7 +53,8 @@ noinst_PROGRAMS = zap + zap_SOURCES = zardoz.pc + END + +-echo 'int main(void) [ return bar(1); ]' > foo-main.pc ++echo 'extern int bar(int);' > foo-main.pc ++echo 'int main(void) [ return bar(1); ]' >> foo-main.pc + echo 'int bar(int x) { return !x; }' > barbar.c + echo 'int m@in(void) { return 0; }' > sub/zardoz.pc + +diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh +index 5b258a30c..8cc0d06a2 100644 +--- a/t/yacc-basic.sh ++++ b/t/yacc-basic.sh +@@ -49,6 +49,7 @@ a : 'a' { exit(0); }; + END + + cat > foo.c << 'END' ++extern int yyparse(void); + int main () { yyparse (); return 1; } + END + +diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh +index 373774b6a..fef079cf3 100644 +--- a/t/yacc-clean.sh ++++ b/t/yacc-clean.sh +@@ -65,6 +65,8 @@ END + + cat > sub1/parse.y << 'END' + %{ ++#include ++ + int yylex () { return (getchar ()); } + void yyerror (const char *s) {} + %} +@@ -74,6 +76,8 @@ END + cp sub1/parse.y sub2/parse.y + + cat > sub1/main.c << 'END' ++extern int yyparse(void); ++ + int main () + { + return yyparse (); +diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh +index d350a80f9..4a8ebe9ca 100644 +--- a/t/yacc-nodist.sh ++++ b/t/yacc-nodist.sh +@@ -78,6 +78,8 @@ BUILT_SOURCES = parse.h + END + + cat > sub1/main.c << 'END' ++extern int yyparse(void); ++ + int main () + { + return yyparse (); +-- +2.38.1 + diff --git a/v3-0003-tests-Fix-implicit-function-declaration-in-ax-dep.patch b/v3-0003-tests-Fix-implicit-function-declaration-in-ax-dep.patch new file mode 100644 index 0000000..4ff1f4e --- /dev/null +++ b/v3-0003-tests-Fix-implicit-function-declaration-in-ax-dep.patch @@ -0,0 +1,58 @@ +From 5e74354030fe88e038a6fc1b3f4c2321df150352 Mon Sep 17 00:00:00 2001 +From: Frederic Berat +Date: Fri, 16 Dec 2022 06:42:45 +0100 +Subject: [PATCH v3] tests: Fix implicit function declaration in ax/depcomp.sh +In-Reply-To: <20230113064804.580F5340B54@smtp.gentoo.org> + +Change since v2: + - Replace the mv operation by a cp operation to ensure that subfoo.h is + considered being modified. + +-- 8< -- + +In depcomp.sh, the following occurs: + +1. Files are created so that headers and units are available in + subdirectories +2. Multiple "make" are executed, while modifying the content of the + headers, some should fail, others should succeed. +3. At the end, the "sub/subfoo.h" header gets removed. +4. make is executed again, which is expected to succeed. + +Yet, with c99, this can't work as the subfoo.h header contains +declaration that are used by foo.c. +Thus, we need to get them back, either by inserting the declaration in +foo.c (or any other header/unit), or by restoring subfoo.h to its +original state. + +The later solution seems the easiest path, being less intrusive in +depcomp.sh. +--- + t/ax/depcomp.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh +index 7a3ac63a7..c92f7c8df 100644 +--- a/t/ax/depcomp.sh ++++ b/t/ax/depcomp.sh +@@ -243,6 +243,7 @@ cat > sub/subfoo.h <<'END' + #include + extern int subfoo (void); + END ++cp sub/subfoo.h sub/subfoo.save + + cat > src/baz.c <<'END' + #include "baz.h" +@@ -399,8 +400,7 @@ do_test () + && rewrite "$srcdir"/sub/subfoo.h echo 'choke me' \ + && not $MAKE \ + && delete "$srcdir"/sub/subfoo.h \ +- && edit "$srcdir"/sub/subfoo.c -e 1d \ +- && edit "$srcdir"/foo.h -e 2d \ ++ && cp "$srcdir"/sub/subfoo.save "$srcdir"/sub/subfoo.h \ + && make_ok \ + || r='not ok' + result_ "$r" "$pfx dependency tracking works" +-- +2.39.0 +