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 /newlib/libc/sys/epiphany | |
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 'newlib/libc/sys/epiphany')
-rw-r--r-- | newlib/libc/sys/epiphany/Makefile.am | 2 | ||||
-rw-r--r-- | newlib/libc/sys/epiphany/Makefile.in | 8 | ||||
-rw-r--r-- | newlib/libc/sys/epiphany/aclocal.m4 | 24 | ||||
-rwxr-xr-x | newlib/libc/sys/epiphany/configure | 3 | ||||
-rw-r--r-- | newlib/libc/sys/epiphany/configure.ac | 1 |
5 files changed, 12 insertions, 26 deletions
diff --git a/newlib/libc/sys/epiphany/Makefile.am b/newlib/libc/sys/epiphany/Makefile.am index f54422df4..847a37b51 100644 --- a/newlib/libc/sys/epiphany/Makefile.am +++ b/newlib/libc/sys/epiphany/Makefile.am @@ -37,5 +37,5 @@ lib_a_SOURCES = e_printf.c lib_a_CCASFLAGS = $(AM_CCASFLAGS) lib_a_CFLAGS = $(AM_CFLAGS) -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. +ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff --git a/newlib/libc/sys/epiphany/Makefile.in b/newlib/libc/sys/epiphany/Makefile.in index b9660f022..3d735fca5 100644 --- a/newlib/libc/sys/epiphany/Makefile.in +++ b/newlib/libc/sys/epiphany/Makefile.in @@ -82,8 +82,10 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/../../../../mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../../acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../../../../config/depstand.m4 \ + $(top_srcdir)/../../../../config/lead-dot.m4 \ + $(top_srcdir)/../../../../config/override.m4 \ + $(top_srcdir)/../../../acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -243,7 +245,7 @@ noinst_LIBRARIES = lib.a lib_a_SOURCES = e_printf.c lib_a_CCASFLAGS = $(AM_CCASFLAGS) lib_a_CFLAGS = $(AM_CFLAGS) -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. +ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host all: all-am diff --git a/newlib/libc/sys/epiphany/aclocal.m4 b/newlib/libc/sys/epiphany/aclocal.m4 index f721fa56b..7b3f348d3 100644 --- a/newlib/libc/sys/epiphany/aclocal.m4 +++ b/newlib/libc/sys/epiphany/aclocal.m4 @@ -579,27 +579,6 @@ if test x"${install_sh}" != xset; then fi AC_SUBST(install_sh)]) -# Copyright (C) 2003, 2005 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. - -# serial 2 - -# 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])]) - # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering @@ -1066,4 +1045,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../../../../config/depstand.m4]) +m4_include([../../../../config/lead-dot.m4]) +m4_include([../../../../config/override.m4]) m4_include([../../../acinclude.m4]) diff --git a/newlib/libc/sys/epiphany/configure b/newlib/libc/sys/epiphany/configure index aff22b4f4..a2deef41f 100755 --- a/newlib/libc/sys/epiphany/configure +++ b/newlib/libc/sys/epiphany/configure @@ -1833,6 +1833,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/newlib/libc/sys/epiphany/configure.ac b/newlib/libc/sys/epiphany/configure.ac index 0e08f6e03..e24dd252c 100644 --- a/newlib/libc/sys/epiphany/configure.ac +++ b/newlib/libc/sys/epiphany/configure.ac @@ -28,7 +28,6 @@ dnl POSSIBILITY OF SUCH DAMAGE. dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.59) AC_INIT([newlib],[NEWLIB_VERSION]) AC_CONFIG_SRCDIR([e_printf.c]) |