From 00de0004bbb7c0816f9f899345971c148c9e59d9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 10 Apr 2026 23:39:47 +0000 Subject: [PATCH] m4: Backport ax_prog_cc_for_build.m4 macros autoconf-2.73 has logic to use C23 which spills into CC_FOR_BUILD [1] Bring back the upstream fix from autoconf-archives, this should not be needed when sudo is updated to next version as it might have regenerated its autotools files and it would have it. [1] https://savannah.gnu.org/support/index.php?111401 Upstream-Status: Inappropriate [Already in autoconf-archive ] Signed-off-by: Khem Raj --- m4/ax_prog_cc_for_build.m4 | 133 ++++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 61 deletions(-) diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 index afd7261..4d1de99 100644 --- a/m4/ax_prog_cc_for_build.m4 +++ b/m4/ax_prog_cc_for_build.m4 @@ -26,45 +26,41 @@ # LICENSE # # Copyright (c) 2008 Paolo Bonzini -# Copyright (c) 2008-2025 The strace developers. # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 9 -#modified for strace project +#serial 26 AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CPP])dnl -AC_REQUIRE([AC_EXEEXT])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl dnl Use the standard macros, but make them use other variable names dnl pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl +pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl +pushdef([ac_cv_prog_cc_c99], ac_cv_build_prog_cc_c99)dnl +pushdef([ac_cv_prog_cc_c11], ac_cv_build_prog_cc_c11)dnl +pushdef([ac_cv_prog_cc_c23], ac_cv_build_prog_cc_c23)dnl +pushdef([ac_cv_prog_cc_stdc], ac_cv_build_prog_cc_stdc)dnl pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl -pushdef([ac_cv_prog_cc_stdc], ac_cv_build_prog_cc_stdc)dnl -pushdef([ac_cv_prog_cc_c11], ac_cv_build_prog_cc_c11)dnl -pushdef([ac_cv_prog_cc_c99], ac_cv_build_prog_cc_c99)dnl -pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl -pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl -pushdef([ac_cv_objext], ac_cv_build_objext)dnl +pushdef([ac_prog_cc_stdc], ac_build_prog_cc_stdc)dnl pushdef([ac_exeext], ac_build_exeext)dnl pushdef([ac_objext], ac_build_objext)dnl pushdef([CC], CC_FOR_BUILD)dnl pushdef([CPP], CPP_FOR_BUILD)dnl +pushdef([GCC], GCC_FOR_BUILD)dnl pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl -pushdef([WARN_CFLAGS], WARN_CFLAGS_FOR_BUILD)dnl -pushdef([TEST_WARN_CFLAGS], TEST_WARN_CFLAGS_FOR_BUILD)dnl pushdef([host], build)dnl pushdef([host_alias], build_alias)dnl pushdef([host_cpu], build_cpu)dnl @@ -75,51 +71,58 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl pushdef([ac_cv_host_os], ac_cv_build_os)dnl -pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl +pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl -pushdef([gl_unknown_warnings_are_errors], gl_build_unknown_warnings_are_errors)dnl -pushdef([st_cv_enable_Werror], st_cv_build_enable_Werror)dnl -pushdef([st_cv_cc_enable_Werror], st_cv_build_cc_enable_Werror)dnl +pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl +pushdef([cross_compiling], cross_compiling_build)dnl +dnl +dnl These variables are problematic to rename by M4 macros, so we save +dnl their values in alternative names, and restore the values later. +dnl +dnl _AC_COMPILER_EXEEXT and _AC_COMPILER_OBJEXT internally call +dnl AC_SUBST which prevents the renaming of EXEEXT and OBJEXT +dnl variables. It's not a good idea to rename ac_cv_exeext and +dnl ac_cv_objext either as they're related. +dnl Renaming ac_exeext and ac_objext is safe though. +dnl +ac_cv_host_exeext=$ac_cv_exeext +AS_VAR_SET_IF([ac_cv_build_exeext], + [ac_cv_exeext=$ac_cv_build_exeext], + [AS_UNSET([ac_cv_exeext])]) +ac_cv_host_objext=$ac_cv_objext +AS_VAR_SET_IF([ac_cv_build_objext], + [ac_cv_objext=$ac_cv_build_objext], + [AS_UNSET([ac_cv_objext])]) +dnl +dnl ac_cv_c_compiler_gnu is used in _AC_LANG_COMPILER_GNU (called by +dnl AC_PROG_CC) indirectly. +dnl +ac_cv_host_c_compiler_gnu=$ac_cv_c_compiler_gnu +AS_VAR_SET_IF([ac_cv_build_c_compiler_gnu], + [ac_cv_c_compiler_gnu=$ac_cv_build_c_compiler_gnu], + [AS_UNSET([ac_cv_c_compiler_gnu])]) -st_SAVE_VAR([ac_c_decl_warn_flag]) -st_SAVE_VAR([ac_c_preproc_warn_flag]) -st_SAVE_VAR([ac_c_werror_flag]) -st_SAVE_VAR([ac_compile]) -st_SAVE_VAR([ac_compiler_gnu]) -st_SAVE_VAR([ac_cpp]) -st_SAVE_VAR([ac_cv_c_compiler_gnu]) -st_SAVE_VAR([ac_cv_c_decl_report]) -st_SAVE_VAR([ac_link]) -st_SAVE_VAR([ac_tool_prefix]) -st_SAVE_VAR([cross_compiling]) -cross_compiling=no +cross_compiling_build=no -AC_MSG_NOTICE([looking for a C compiler that generates native executables]) +ac_build_tool_prefix= +AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], + [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) + +AC_LANG_PUSH([C]) AC_PROG_CC +_AC_COMPILER_EXEEXT +_AC_COMPILER_OBJEXT AC_PROG_CPP -AC_EXEEXT - -st_WARN_CFLAGS -st_RESTORE_VAR([cross_compiling]) -st_RESTORE_VAR([ac_tool_prefix]) -st_RESTORE_VAR([ac_link]) -st_RESTORE_VAR([ac_cv_c_decl_report]) -st_RESTORE_VAR([ac_cv_c_compiler_gnu]) -st_RESTORE_VAR([ac_cpp]) -st_RESTORE_VAR([ac_compiler_gnu]) -st_RESTORE_VAR([ac_compile]) -st_RESTORE_VAR([ac_c_werror_flag]) -st_RESTORE_VAR([ac_c_preproc_warn_flag]) -st_RESTORE_VAR([ac_c_decl_warn_flag]) +BUILD_EXEEXT=$ac_cv_exeext +BUILD_OBJEXT=$ac_cv_objext dnl Restore the old definitions dnl -popdef([st_cv_cc_enable_Werror])dnl -popdef([st_cv_enable_Werror])dnl -popdef([gl_unknown_warnings_are_errors])dnl -popdef([am_cv_CC_dependencies_compiler_type])dnl +popdef([cross_compiling])dnl popdef([am_cv_prog_cc_c_o])dnl +popdef([am_cv_CC_dependencies_compiler_type])dnl +popdef([ac_tool_prefix])dnl popdef([ac_cv_host_os])dnl popdef([ac_cv_host_vendor])dnl popdef([ac_cv_host_cpu])dnl @@ -130,35 +133,43 @@ popdef([host_vendor])dnl popdef([host_cpu])dnl popdef([host_alias])dnl popdef([host])dnl -popdef([TEST_WARN_CFLAGS])dnl -popdef([WARN_CFLAGS])dnl popdef([LDFLAGS])dnl popdef([CPPFLAGS])dnl popdef([CFLAGS])dnl +popdef([GCC])dnl popdef([CPP])dnl popdef([CC])dnl popdef([ac_objext])dnl popdef([ac_exeext])dnl -popdef([ac_cv_objext])dnl -popdef([ac_cv_exeext])dnl -popdef([ac_cv_prog_cc_c89])dnl -popdef([ac_cv_prog_cc_c99])dnl -popdef([ac_cv_prog_cc_c11])dnl -popdef([ac_cv_prog_cc_stdc])dnl +popdef([ac_prog_cc_stdc])dnl popdef([ac_cv_prog_cc_g])dnl popdef([ac_cv_prog_cc_cross])dnl popdef([ac_cv_prog_cc_works])dnl +popdef([ac_cv_prog_cc_stdc])dnl +popdef([ac_cv_prog_cc_c23])dnl +popdef([ac_cv_prog_cc_c11])dnl +popdef([ac_cv_prog_cc_c99])dnl +popdef([ac_cv_prog_cc_c89])dnl popdef([ac_cv_prog_gcc])dnl popdef([ac_cv_prog_CPP])dnl +dnl +ac_cv_exeext=$ac_cv_host_exeext +EXEEXT=$ac_cv_host_exeext +ac_cv_objext=$ac_cv_host_objext +OBJEXT=$ac_cv_host_objext +ac_cv_c_compiler_gnu=$ac_cv_host_c_compiler_gnu +ac_compiler_gnu=$ac_cv_host_c_compiler_gnu + +dnl restore global variables ac_ext, ac_cpp, ac_compile, +dnl ac_link, ac_compiler_gnu (dependent on the current +dnl language after popping): +AC_LANG_POP([C]) dnl Finally, set Makefile variables dnl -BUILD_EXEEXT=$ac_build_exeext -BUILD_OBJEXT=$ac_build_objext -AC_SUBST(BUILD_EXEEXT)dnl -AC_SUBST(BUILD_OBJEXT)dnl +AC_SUBST([BUILD_EXEEXT])dnl +AC_SUBST([BUILD_OBJEXT])dnl AC_SUBST([CFLAGS_FOR_BUILD])dnl AC_SUBST([CPPFLAGS_FOR_BUILD])dnl AC_SUBST([LDFLAGS_FOR_BUILD])dnl -AC_SUBST([WARN_CFLAGS_FOR_BUILD])dnl ])