isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cross-build support for mksigname and mksiglist

Browse Source 
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
2021-08-19 09:50:05 -06:00
parent bf7d20b482
commit b40f74cb24
12 changed files with 1391 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/util/Makefile.in
View File

@@ -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

15
lib/util/mksiglist.c
View File

@@ -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");

13
lib/util/mksigname.c
View File

@@ -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 {

8
lib/util/mksiglist.h → lib/util/sys_siglist.h
View File

@@ -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";

8
lib/util/mksigname.h → lib/util/sys_signame.h
View File

@@ -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";