Re: 13 stable build fail

From: Søren_Schmidt <soren.schmidt_at_gmail.com>
Date: Sat, 03 Jul 2021 08:12:07 UTC
On 3 Jul 2021, at 03.33, Rozhuk Ivan <rozhuk.im@gmail.com> wrote:
> ...
> In file included from /usr/src/lib/libc/gen/fstab.c:38:
> In file included from /tmp/obj.world/usr/src/amd64.amd64/tmp/usr/include/sys/mount.h:38:
> /tmp/obj.world/usr/src/amd64.amd64/tmp/usr/include/sys/ucred.h:42:10: fatal error: 'bsm/audit.h' file not found
> #include <bsm/audit.h>
>         ^~~~~~~~~~~~~
> 1 error generated.
> --- fstab.o ---
> *** [fstab.o] Error code 1
> 
> make[4]: stopped in /usr/src/lib/libc
> In file included from /usr/src/lib/libc/gen/fts.c:40:
> In file included from /tmp/obj.world/usr/src/amd64.amd64/tmp/usr/include/sys/mount.h:38:
> /tmp/obj.world/usr/src/amd64.amd64/tmp/usr/include/sys/ucred.h:42:10: fatal error: 'bsm/audit.h' file not found
> #include <bsm/audit.h>
>         ^~~~~~~~~~~~~
> In file included from /usr/src/lib/libc/gen/fts-compat.c:41:
> In file included from /tmp/obj.world/usr/src/amd64.amd64/tmp/usr/include/sys/mount.h:38:
> /tmp/obj.world/usr/src/amd64.amd64/tmp/usr/include/sys/ucred.h:42:10: fatal error: 'bsm/audit.h' file not found
> #include <bsm/audit.h>
>         ^~~~~~~~~~~~~
> 1 error generated.
> --- fts.o ---
> *** [fts.o] Error code 1
> 
> make[4]: stopped in /usr/src/lib/libc
> ...
> 


The latest changes to include/Makefile broke building with "WITHOUT_AUDIT=1"

This patch works for me:

Index: stable13/include/Makefile
===================================================================
--- stable13/include/Makefile	(revision 550)
+++ stable13/include/Makefile	(revision 552)
@@ -223,6 +223,7 @@
 INCSGROUPS=	INCS \
 		ACPICA \
 		AGP \
+		BSM \
 		CAM \
 		CAMATA \
 		CAMMMC \
@@ -240,7 +241,6 @@
 		VERIEXEC
 
 .if ${MK_AUDIT} != "no"
-INCSGROUPS+=	BSM
 INCSGROUPS+=	SECAUDIT
 .endif
 

--
Søren Schmidt
sos@deepcore.dk / sos@freebsd.org
"So much code to hack, so little time"