diff options
author | Mike Frysinger <vapier@gentoo.org> | 2021-12-30 21:29:02 +0300 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-14 23:24:33 +0300 |
commit | a100e80fc9a9243c913035c3d40bf8ec4dc5c6fc (patch) | |
tree | 99759688c13aa1ad42c8aa5f713a2fc9347bf220 /libgloss/aarch64 | |
parent | 909ed837ccb932ea70f71cc41891fa2c8143133f (diff) |
require autoconf-2.69 exactly
The newlib & libgloss dirs are already generated using autoconf-2.69.
To avoid merging new code and/or accidental regeneration using diff
versions, leverage config/override.m4 to pin to 2.69 exactly. This
matches what gcc/binutils/gdb are already doing.
The README file already says to use autoconf-2.69.
To accomplish this, it's just as simple as adding -I flags to the
top-level config/ dir when running aclocal. This is because the
override.m4 file overrides AC_INIT to first require the specific
autoconf version before calling the real AC_INIT.
Diffstat (limited to 'libgloss/aarch64')
-rw-r--r-- | libgloss/aarch64/aclocal.m4 | 22 | ||||
-rwxr-xr-x | libgloss/aarch64/configure | 3 | ||||
-rw-r--r-- | libgloss/aarch64/configure.ac | 1 | ||||
-rw-r--r-- | libgloss/aarch64/cpu-init/aclocal.m4 | 22 | ||||
-rwxr-xr-x | libgloss/aarch64/cpu-init/configure | 3 | ||||
-rw-r--r-- | libgloss/aarch64/cpu-init/configure.ac | 1 |
6 files changed, 12 insertions, 40 deletions
diff --git a/libgloss/aarch64/aclocal.m4 b/libgloss/aarch64/aclocal.m4 index f3492eebf..24271f381 100644 --- a/libgloss/aarch64/aclocal.m4 +++ b/libgloss/aarch64/aclocal.m4 @@ -310,25 +310,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001-2017 Free Software Foundation, Inc. @@ -396,4 +377,7 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4_include([../../config/depstand.m4]) +m4_include([../../config/lead-dot.m4]) +m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/aarch64/configure b/libgloss/aarch64/configure index b660ebd9a..723862766 100755 --- a/libgloss/aarch64/configure +++ b/libgloss/aarch64/configure @@ -1765,6 +1765,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + ac_aux_dir= for ac_dir in ../.. "$srcdir"/../..; do if test -f "$ac_dir/install-sh"; then diff --git a/libgloss/aarch64/configure.ac b/libgloss/aarch64/configure.ac index da932e51a..303e51359 100644 --- a/libgloss/aarch64/configure.ac +++ b/libgloss/aarch64/configure.ac @@ -1,5 +1,4 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.69)dnl AC_INIT(crt0.S) AC_CONFIG_AUX_DIR(../..) diff --git a/libgloss/aarch64/cpu-init/aclocal.m4 b/libgloss/aarch64/cpu-init/aclocal.m4 index 2fb548398..5ca701920 100644 --- a/libgloss/aarch64/cpu-init/aclocal.m4 +++ b/libgloss/aarch64/cpu-init/aclocal.m4 @@ -310,25 +310,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001-2017 Free Software Foundation, Inc. @@ -396,4 +377,7 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4_include([../../../config/depstand.m4]) +m4_include([../../../config/lead-dot.m4]) +m4_include([../../../config/override.m4]) m4_include([../../acinclude.m4]) diff --git a/libgloss/aarch64/cpu-init/configure b/libgloss/aarch64/cpu-init/configure index bc5df10cd..c8159716a 100755 --- a/libgloss/aarch64/cpu-init/configure +++ b/libgloss/aarch64/cpu-init/configure @@ -1762,6 +1762,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + ac_aux_dir= for ac_dir in ../../.. "$srcdir"/../../..; do if test -f "$ac_dir/install-sh"; then diff --git a/libgloss/aarch64/cpu-init/configure.ac b/libgloss/aarch64/cpu-init/configure.ac index 40a33c055..91aa2211d 100644 --- a/libgloss/aarch64/cpu-init/configure.ac +++ b/libgloss/aarch64/cpu-init/configure.ac @@ -1,5 +1,4 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.69)dnl AC_INIT(Makefile.in) AC_CONFIG_AUX_DIR(../../..) |