From a8a37d4ea5993894ff8b22e1445a6967c563f1cd Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 2 Mar 2021 11:34:24 +0000 Subject: Revert "toolchain: add autoconf-lean" autoconf-lean was not ready yet. Revert it until things get sorted. This reverts commit 32c664ff02910bf39a3fbd5a5a4a8bff3191dd03. Signed-off-by: Daniel Golle --- .../patches/100-remove-unused-checks.patch | 93 ---------------------- .../patches/120-add-extra-checks.patch | 48 ----------- 2 files changed, 141 deletions(-) delete mode 100644 toolchain/autoconf-lean/patches/100-remove-unused-checks.patch delete mode 100644 toolchain/autoconf-lean/patches/120-add-extra-checks.patch (limited to 'toolchain/autoconf-lean/patches') diff --git a/toolchain/autoconf-lean/patches/100-remove-unused-checks.patch b/toolchain/autoconf-lean/patches/100-remove-unused-checks.patch deleted file mode 100644 index aa26336fe0..0000000000 --- a/toolchain/autoconf-lean/patches/100-remove-unused-checks.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- a/config-site-generator/configure.ac -+++ b/config-site-generator/configure.ac -@@ -31,16 +31,16 @@ AC_PROG_GCC_TRADITIONAL - AC_PROG_CXX - AC_PROG_CXXCPP - AC_PROG_CXX_C_O --AC_PROG_OBJC --AC_PROG_OBJCPP --AC_PROG_OBJCXX --AC_PROG_OBJCXXCPP -+#AC_PROG_OBJC -+#AC_PROG_OBJCPP -+#AC_PROG_OBJCXX -+#AC_PROG_OBJCXXCPP - #AC_ERLANG_PATH_ERLC - #AC_ERLANG_PATH_ERL --AC_PROG_F77 --AC_PROG_FC --AC_PROG_F77_C_O --AC_PROG_FC_C_O -+#AC_PROG_F77 -+#AC_PROG_FC -+#AC_PROG_F77_C_O -+#AC_PROG_FC_C_O - #AC_PROG_GO - AC_PROG_AWK - AC_PROG_GREP -@@ -52,13 +52,13 @@ AC_PROG_LEX - AC_PROG_LN_S - AC_PROG_RANLIB - AC_PROG_SED --AC_PROG_YACC -+#AC_PROG_YACC - - AM_PROG_AS - - # Checks for system services. --AC_PATH_X --AC_PATH_XTRA -+#AC_PATH_X -+#AC_PATH_XTRA - AC_SYS_INTERPRETER - AC_SYS_LARGEFILE - AC_SYS_LONG_FILE_NAMES -@@ -163,27 +163,27 @@ AC_C_FLEXIBLE_ARRAY_MEMBER - AC_C_VARARRAYS - AC_C_TYPEOF - AC_C_PROTOTYPES --AC_F77_LIBRARY_LDFLAGS --AC_FC_LIBRARY_LDFLAGS --AC_F77_DUMMY_MAIN --AC_FC_DUMMY_MAIN --AC_F77_MAIN --AC_FC_MAIN --AC_F77_WRAPPERS --AC_FC_WRAPPERS --AC_F77_FUNC --AC_FC_FUNC --AC_FC_PP_SRCEXT --AC_FC_PP_DEFINE --AC_FC_FREEFORM --AC_FC_FIXEDFORM --AC_FC_LINE_LENGTH --AC_FC_CHECK_BOUNDS --AC_F77_IMPLICIT_NONE --AC_FC_IMPLICIT_NONE --AC_FC_MODULE_EXTENSION --AC_FC_MODULE_FLAG --AC_FC_MODULE_OUTPUT_FLAG -+#AC_F77_LIBRARY_LDFLAGS -+#AC_FC_LIBRARY_LDFLAGS -+#AC_F77_DUMMY_MAIN -+#AC_FC_DUMMY_MAIN -+#AC_F77_MAIN -+#AC_FC_MAIN -+#AC_F77_WRAPPERS -+#AC_FC_WRAPPERS -+#AC_F77_FUNC -+#AC_FC_FUNC -+#AC_FC_PP_SRCEXT -+#AC_FC_PP_DEFINE -+#AC_FC_FREEFORM -+#AC_FC_FIXEDFORM -+#AC_FC_LINE_LENGTH -+#AC_FC_CHECK_BOUNDS -+#AC_F77_IMPLICIT_NONE -+#AC_FC_IMPLICIT_NONE -+#AC_FC_MODULE_EXTENSION -+#AC_FC_MODULE_FLAG -+#AC_FC_MODULE_OUTPUT_FLAG - - # Checks for library functions. - AC_FUNC_ALLOCA diff --git a/toolchain/autoconf-lean/patches/120-add-extra-checks.patch b/toolchain/autoconf-lean/patches/120-add-extra-checks.patch deleted file mode 100644 index 7e81525daf..0000000000 --- a/toolchain/autoconf-lean/patches/120-add-extra-checks.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/config-site-generator/configure.ac -+++ b/config-site-generator/configure.ac -@@ -23,6 +23,7 @@ AC_DEFUN([AC_MSG_ERROR], [ - test -e conftest.dir && rm -rf conftest.dir ]) - - # Checks for programs. -+AC_PROG_CC - AC_PROG_CC_C89 - AC_PROG_CC_C_O - AC_PROG_CPP -@@ -52,9 +53,11 @@ AC_PROG_LEX - AC_PROG_LN_S - AC_PROG_RANLIB - AC_PROG_SED -+AC_PROG_LEX - #AC_PROG_YACC - - AM_PROG_AS -+AM_PROG_AR - - # Checks for system services. - #AC_PATH_X -@@ -118,6 +121,8 @@ sys/ucontext.h sys/uio.h sys/un.h sys/us - sys/wait.h sys/xattr.h tar.h termios.h tgmath.h time.h ucontext.h ulimit.h \ - unistd.h utime.h utmp.h utmpx.h wchar.h wctype.h wordexp.h - ]) -+# extra headers -+AC_CHECK_HEADERS([sys/cdefs.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_TYPE_GETGROUPS -@@ -217,6 +222,16 @@ AC_FUNC_STRTOLD - AC_FUNC_UTIME_NULL - AC_FUNC_VPRINTF - -+AC_CHECK_SIZEOF(short) -+AC_CHECK_SIZEOF(int) -+AC_CHECK_SIZEOF(long) -+AC_CHECK_SIZEOF(long long) -+AC_CHECK_SIZEOF(unsigned int) -+AC_CHECK_SIZEOF(unsigned long) -+AC_CHECK_SIZEOF(unsigned long long) -+AC_CHECK_SIZEOF(off_t) -+AC_CHECK_SIZEOF(size_t) -+ - # Functions list scraped from musl 0.9.4 x86_64 - AC_CHECK_FUNCS([ \ - a64l abort abs accept access acos acosf acosh acoshf acoshl acosl addmntent \ -- cgit v1.2.3