Cross-build support for mksigname and mksiglist
We must build these with the host C compiler but use the target preprocessor to generate the output.
This commit is contained in:
Todd C. Miller
2
.gitignore
vendored
2
.gitignore
vendored
@@ -51,7 +51,9 @@ lib/iolog/fuzz_iolog_[a-z]*
|
||||
lib/iolog/host_port_test
|
||||
|
||||
lib/util/mksiglist
|
||||
lib/util/mksiglist.h
|
||||
lib/util/mksigname
|
||||
lib/util/mksigname.h
|
||||
lib/util/siglist.c
|
||||
lib/util/signame.c
|
||||
lib/util/util.exp
|
||||
|
||||
@@ -47,7 +47,9 @@ Makefile$
|
||||
^lib/iolog/host_port_test$
|
||||
|
||||
^lib/util/mksiglist$
|
||||
^lib/util/mksiglist.h$
|
||||
^lib/util/mksigname$
|
||||
^lib/util/mksigname.h$
|
||||
^lib/util/siglist\.c$
|
||||
^lib/util/signame\.c$
|
||||
^lib/util/util\.exp$
|
||||
|
||||
5
MANIFEST
5
MANIFEST
@@ -217,9 +217,7 @@ lib/util/logpri.c
|
||||
lib/util/memrchr.c
|
||||
lib/util/mkdir_parents.c
|
||||
lib/util/mksiglist.c
|
||||
lib/util/mksiglist.h
|
||||
lib/util/mksigname.c
|
||||
lib/util/mksigname.h
|
||||
lib/util/mktemp.c
|
||||
lib/util/nanosleep.c
|
||||
lib/util/openat.c
|
||||
@@ -308,6 +306,8 @@ lib/util/strtonum.c
|
||||
lib/util/sudo_conf.c
|
||||
lib/util/sudo_debug.c
|
||||
lib/util/sudo_dso.c
|
||||
lib/util/sys_siglist.h
|
||||
lib/util/sys_signame.h
|
||||
lib/util/term.c
|
||||
lib/util/ttyname_dev.c
|
||||
lib/util/ttysize.c
|
||||
@@ -372,6 +372,7 @@ m4/ax_check_compile_flag.m4
|
||||
m4/ax_check_link_flag.m4
|
||||
m4/ax_func_getaddrinfo.m4
|
||||
m4/ax_func_snprintf.m4
|
||||
m4/ax_prog_cc_for_build.m4
|
||||
m4/libtool.m4
|
||||
m4/ltoptions.m4
|
||||
m4/ltsugar.m4
|
||||
|
||||
1
aclocal.m4
vendored
1
aclocal.m4
vendored
@@ -17,6 +17,7 @@ m4_include([m4/ax_check_compile_flag.m4])
|
||||
m4_include([m4/ax_check_link_flag.m4])
|
||||
m4_include([m4/ax_func_getaddrinfo.m4])
|
||||
m4_include([m4/ax_func_snprintf.m4])
|
||||
m4_include([m4/ax_prog_cc_for_build.m4])
|
||||
m4_include([m4/libtool.m4])
|
||||
m4_include([m4/ltoptions.m4])
|
||||
m4_include([m4/ltsugar.m4])
|
||||
|
||||
@@ -1596,6 +1596,7 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
|
||||
if test X"$AR" = X"false"; then
|
||||
AC_MSG_ERROR([the "ar" utility is required to build sudo])
|
||||
fi
|
||||
AX_PROG_CC_FOR_BUILD
|
||||
|
||||
if test "x$ac_cv_prog_cc_c89" = "xno"; then
|
||||
AC_MSG_ERROR([Sudo version $PACKAGE_VERSION requires an ANSI C compiler to build.])
|
||||
|
||||
@@ -50,6 +50,9 @@ shlib_opt = util.opt
|
||||
|
||||
# Compiler & tools to use
|
||||
CC = @CC@
|
||||
HOSTCC = @CC_FOR_BUILD@
|
||||
CPP = @CPP@
|
||||
HOSTCPP = @CPP_FOR_BUILD@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
SED = @SED@
|
||||
AWK = @AWK@
|
||||
@@ -65,9 +68,12 @@ CPPDEFS = -D_PATH_SUDO_CONF=\"$(sysconfdir)/sudo.conf\"
|
||||
# C preprocessor flags
|
||||
CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(srcdir) $(CPPDEFS) @CPPFLAGS@ \
|
||||
-DDEFAULT_TEXT_DOMAIN=\"@PACKAGE_NAME@\"
|
||||
HOSTCPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(srcdir) $(CPPDEFS) \
|
||||
@CPPFLAGS_FOR_BUILD@ -DDEFAULT_TEXT_DOMAIN=\"@PACKAGE_NAME@\"
|
||||
|
||||
# Usually -O and/or -g
|
||||
CFLAGS = @CFLAGS@
|
||||
HOSTCFLAGS = @CFLAGS_FOR_BUILD@
|
||||
|
||||
# Flags to pass to the link stage
|
||||
LDFLAGS = @LDFLAGS@
|
||||
@@ -227,21 +233,27 @@ signame.c: mksigname
|
||||
./mksigname > $@
|
||||
|
||||
mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@
|
||||
$(HOSTCC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@
|
||||
|
||||
mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksigname.c -o $@
|
||||
$(HOSTCC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksigname.c -o $@
|
||||
|
||||
$(srcdir)/mksiglist.h: $(srcdir)/siglist.in
|
||||
$(srcdir)/sys_siglist.h: $(srcdir)/siglist.in
|
||||
@if [ -n "$(DEVEL)" ]; then \
|
||||
$(AWK) 'BEGIN {print "/* public domain */\n"} /^ [A-Z]/ {printf("#ifdef SIG%s\n if (sudo_sys_siglist[SIG%s] == NULL)\n\tsudo_sys_siglist[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, substr($$0, 13))}' < $(srcdir)/siglist.in > $@; \
|
||||
$(AWK) 'BEGIN {print "/* public domain */\n\n#include <config.h>\n#include <sys/types.h>\n#include <signal.h>\n#include \"sudo_compat.h\"\n\nint sudo_end_of_headers;\nstatic char *sudo_sys_siglist[NSIG];\n"} /^ [A-Z]/ {printf("#ifdef SIG%s\n if (sudo_sys_siglist[SIG%s] == NULL)\n\tsudo_sys_siglist[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, substr($$0, 13))}' < $(srcdir)/siglist.in > $@; \
|
||||
fi
|
||||
|
||||
$(srcdir)/mksigname.h: $(srcdir)/siglist.in
|
||||
$(srcdir)/sys_signame.h: $(srcdir)/siglist.in
|
||||
@if [ -n "$(DEVEL)" ]; then \
|
||||
$(AWK) 'BEGIN {print "/* public domain */\n"} /^ [A-Z]/ {printf("#ifdef SIG%s\n if (sudo_sys_signame[SIG%s] == NULL)\n\tsudo_sys_signame[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, $$1)}' < $(srcdir)/siglist.in > $@; \
|
||||
$(AWK) 'BEGIN {print "/* public domain */\n\n#include <config.h>\n#include <sys/types.h>\n#include <signal.h>\n#include \"sudo_compat.h\"\n\nint sudo_end_of_headers;\nstatic char *sudo_sys_signame[NSIG];\n"} /^ [A-Z]/ {printf("#ifdef SIG%s\n if (sudo_sys_signame[SIG%s] == NULL)\n\tsudo_sys_signame[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, $$1)}' < $(srcdir)/siglist.in > $@; \
|
||||
fi
|
||||
|
||||
mksiglist.h: $(srcdir)/sys_siglist.h
|
||||
$(CPP) $(CPPFLAGS) $(srcdir)/sys_siglist.h | sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksiglist.h
|
||||
|
||||
mksigname.h: $(srcdir)/sys_signame.h
|
||||
$(CPP) $(CPPFLAGS) $(srcdir)/sys_signame.h | sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h
|
||||
|
||||
conf_test: $(CONF_TEST_OBJS) libsudo_util.la
|
||||
$(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(CONF_TEST_OBJS) libsudo_util.la $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS)
|
||||
|
||||
@@ -488,8 +500,8 @@ clean:
|
||||
mostlyclean: clean
|
||||
|
||||
distclean: clean
|
||||
-rm -rf Makefile mksiglist siglist.c mksigname signame.c .libs \
|
||||
$(shlib_exp) $(shlib_map) $(shlib_opt)
|
||||
-rm -rf Makefile mksiglist mksiglist.h siglist.c mksigname \
|
||||
mksigname.h signame.c .libs $(shlib_exp) $(shlib_map) $(shlib_opt)
|
||||
|
||||
clobber: distclean
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: ISC
|
||||
*
|
||||
* Copyright (c) 2010-2012, 2015 Todd C. Miller <Todd.Miller@sudo.ws>
|
||||
* Copyright (c) 2010-2012, 2015, 2021 Todd C. Miller <Todd.Miller@sudo.ws>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
@@ -34,21 +34,16 @@ sudo_dso_public int main(int argc, char *argv[]);
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
static char *sudo_sys_siglist[NSIG];
|
||||
int i;
|
||||
unsigned int i;
|
||||
|
||||
#include "mksiglist.h"
|
||||
|
||||
printf("#include <config.h>\n");
|
||||
printf("#include <sys/types.h>\n");
|
||||
printf("#include <signal.h>\n");
|
||||
printf("#include \"sudo_compat.h\"\n\n");
|
||||
printf("const char *const sudo_sys_siglist[NSIG] = {\n");
|
||||
for (i = 0; i < NSIG; i++) {
|
||||
printf("const char *const sudo_sys_siglist[] = {\n");
|
||||
for (i = 0; i < nitems(sudo_sys_siglist); i++) {
|
||||
if (sudo_sys_siglist[i] != NULL) {
|
||||
printf(" \"%s\",\n", sudo_sys_siglist[i]);
|
||||
} else {
|
||||
printf(" \"Signal %d\",\n", i);
|
||||
printf(" \"Signal %u\",\n", i);
|
||||
}
|
||||
}
|
||||
printf("};\n");
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: ISC
|
||||
*
|
||||
* Copyright (c) 2010-2012, 2015 Todd C. Miller <Todd.Miller@sudo.ws>
|
||||
* Copyright (c) 2010-2012, 2015, 2021 Todd C. Miller <Todd.Miller@sudo.ws>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
@@ -34,17 +34,12 @@ sudo_dso_public int main(int argc, char *argv[]);
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
static char *sudo_sys_signame[NSIG];
|
||||
int i;
|
||||
unsigned int i;
|
||||
|
||||
#include "mksigname.h"
|
||||
|
||||
printf("#include <config.h>\n");
|
||||
printf("#include <sys/types.h>\n");
|
||||
printf("#include <signal.h>\n");
|
||||
printf("#include \"sudo_compat.h\"\n\n");
|
||||
printf("const char *const sudo_sys_signame[NSIG] = {\n");
|
||||
for (i = 0; i < NSIG; i++) {
|
||||
printf("const char *const sudo_sys_signame[] = {\n");
|
||||
for (i = 0; i < nitems(sudo_sys_signame); i++) {
|
||||
if (sudo_sys_signame[i] != NULL) {
|
||||
printf(" \"%s\",\n", sudo_sys_signame[i]);
|
||||
} else {
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
/* public domain */
|
||||
|
||||
#include <config.h>
|
||||
#include <sys/types.h>
|
||||
#include <signal.h>
|
||||
#include "sudo_compat.h"
|
||||
|
||||
int sudo_end_of_headers;
|
||||
static char *sudo_sys_siglist[NSIG];
|
||||
|
||||
#ifdef SIGHUP
|
||||
if (sudo_sys_siglist[SIGHUP] == NULL)
|
||||
sudo_sys_siglist[SIGHUP] = "Hangup";
|
||||
@@ -1,5 +1,13 @@
|
||||
/* public domain */
|
||||
|
||||
#include <config.h>
|
||||
#include <sys/types.h>
|
||||
#include <signal.h>
|
||||
#include "sudo_compat.h"
|
||||
|
||||
int sudo_end_of_headers;
|
||||
static char *sudo_sys_signame[NSIG];
|
||||
|
||||
#ifdef SIGHUP
|
||||
if (sudo_sys_signame[SIGHUP] == NULL)
|
||||
sudo_sys_signame[SIGHUP] = "HUP";
|
||||
155
m4/ax_prog_cc_for_build.m4
Normal file
155
m4/ax_prog_cc_for_build.m4
Normal file
@@ -0,0 +1,155 @@
|
||||
# ===========================================================================
|
||||
# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
|
||||
# ===========================================================================
|
||||
#
|
||||
# SYNOPSIS
|
||||
#
|
||||
# AX_PROG_CC_FOR_BUILD
|
||||
#
|
||||
# DESCRIPTION
|
||||
#
|
||||
# This macro searches for a C compiler that generates native executables,
|
||||
# that is a C compiler that surely is not a cross-compiler. This can be
|
||||
# useful if you have to generate source code at compile-time like for
|
||||
# example GCC does.
|
||||
#
|
||||
# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
|
||||
# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
|
||||
# The value of these variables can be overridden by the user by specifying
|
||||
# a compiler with an environment variable (like you do for standard CC).
|
||||
#
|
||||
# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
|
||||
# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
|
||||
# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
|
||||
# substituted in the Makefile.
|
||||
#
|
||||
# LICENSE
|
||||
#
|
||||
# Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
|
||||
#
|
||||
# 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 20
|
||||
|
||||
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_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_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_gcc], ac_cv_build_prog_gcc)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_c_compiler_gnu], ac_cv_build_c_compiler_gnu)dnl
|
||||
pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
|
||||
pushdef([ac_cv_objext], ac_cv_build_objext)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([EXEEXT], BUILD_EXEEXT)dnl
|
||||
pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
|
||||
pushdef([OBJEXT], BUILD_OBJEXT)dnl
|
||||
pushdef([host], build)dnl
|
||||
pushdef([host_alias], build_alias)dnl
|
||||
pushdef([host_cpu], build_cpu)dnl
|
||||
pushdef([host_vendor], build_vendor)dnl
|
||||
pushdef([host_os], build_os)dnl
|
||||
pushdef([ac_cv_host], ac_cv_build)dnl
|
||||
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([ac_tool_prefix], ac_build_tool_prefix)dnl
|
||||
pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl
|
||||
pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl
|
||||
pushdef([cross_compiling], cross_compiling_build)dnl
|
||||
|
||||
cross_compiling_build=no
|
||||
|
||||
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])
|
||||
|
||||
dnl The pushdef([ac_cv_c_compiler_gnu], ...) currently does not cover
|
||||
dnl the use of this variable in _AC_LANG_COMPILER_GNU called by
|
||||
dnl AC_PROG_CC. Unset this cache variable temporarily as a workaround.
|
||||
was_set_ac_cv_c_compiler_gnu=${[ac_cv_c_compiler_gnu]+y}
|
||||
AS_IF([test ${was_set_ac_cv_c_compiler_gnu}],
|
||||
[saved_ac_cv_c_compiler_gnu=$[ac_cv_c_compiler_gnu]
|
||||
AS_UNSET([[ac_cv_c_compiler_gnu]])])
|
||||
|
||||
AC_PROG_CC
|
||||
|
||||
dnl Restore ac_cv_c_compiler_gnu
|
||||
AS_IF([test ${was_set_ac_cv_c_compiler_gnu}],
|
||||
[[ac_cv_c_compiler_gnu]=saved_ac_cv_c_compiler_gnu])
|
||||
|
||||
_AC_COMPILER_EXEEXT
|
||||
_AC_COMPILER_OBJEXT
|
||||
AC_PROG_CPP
|
||||
|
||||
dnl Restore the old definitions
|
||||
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
|
||||
popdef([ac_cv_host_alias])dnl
|
||||
popdef([ac_cv_host])dnl
|
||||
popdef([host_os])dnl
|
||||
popdef([host_vendor])dnl
|
||||
popdef([host_cpu])dnl
|
||||
popdef([host_alias])dnl
|
||||
popdef([host])dnl
|
||||
popdef([OBJEXT])dnl
|
||||
popdef([LDFLAGS])dnl
|
||||
popdef([EXEEXT])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_c_compiler_gnu])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_c89])dnl
|
||||
popdef([ac_cv_prog_gcc])dnl
|
||||
popdef([ac_cv_prog_CPP])dnl
|
||||
|
||||
dnl restore global variables ac_ext, ac_cpp, ac_compile,
|
||||
dnl ac_link, ac_compiler_gnu (dependant on the current
|
||||
dnl language after popping):
|
||||
AC_LANG_POP([C])
|
||||
|
||||
dnl Finally, set Makefile variables
|
||||
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
|
||||
])
|
||||
Reference in New Issue
Block a user