From 5aade5ced5edc40a4ad848cd276813d273d2d04e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Feb 2024 18:29:23 +0100 Subject: [PATCH] package/sudo: drop legacy, useless, and broken post-configure hook Commit b9e89b340e27 (sudo: bump version) introduced the explicit build of mksigname and mksiglist as host tools, as they were required to run on the build machine, to generate C code then used to build the target program. This is now failing to build since the bump to sudo 1.9.15p5 in commit c87746afefe7 (package/sudo: security bump to version 1.9.15p5) (lines manually wrapped and slightly elided for ease of reviewing): /usr/bin/cpp \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -I../../include \ -I../.. \ ./sys_signame.h \ | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h In file included from /usr/include/features.h:394, from /usr/include/sys/types.h:25, from ./sys_signame.h:4: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ /usr/bin/gcc -I../../include -I../.. -I. -I. \ -D_PATH_SUDO_CONF=\"/etc/sudo.conf\" -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -DDEFAULT_TEXT_DOMAIN=\"sudo\" \ -O2 \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ ./mksigname.c -o mksigname In file included from /usr/include/features.h:394, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdlib.h:26, from ./mksigname.c:27: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ make[2]: *** [Makefile:263: mksigname] Error 1 The core of the issue has not been really identified, but it turns out that neither mksiglist nor mksignames is used during the build. This has been tested with a minimal sudo with no option, and with a sudo with all options enabled (linux-pam, zlib, opensldap, and openssl), with the three types of C libraries (glibc, musl, and uClibc-ng). Digging in the sudo buildsystem did not reveal an obvious reason when those would be needed either. Drop the hook now it seems it is no longer used and is atually breaking the build. Fixes: http://autobuild.buildroot.org/results/72f/72ff18fb9b41394a29006f881ee1fbea67a66a09/ Note that there is a second issue in there: the call to the host cpp fails, but since it is on the LHS of a pipe, the error is lost, as the RHS of the pipe (the sed call) succeeds; a fix for that will be sent in a separate patch. Reported-by: Christian Stewart Signed-off-by: Yann E. MORIN Cc: Peter Korsgaard Reviewed-by: Christian Stewart --- package/sudo/sudo.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index a4e838dd94..7961a99002 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -58,15 +58,6 @@ else SUDO_CONF_OPTS += --disable-openssl endif -# mksigname/mksiglist needs to run on build host to generate source files -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - $(MAKE) $(HOST_CONFIGURE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ - -C $(@D)/lib/util mksigname mksiglist -endef - -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - define SUDO_PERMISSIONS /usr/bin/sudo f 4755 0 0 - - - - - endef