git: ba56ee36eb96 - stable/13 - Fix build with WITHOUT_AUDIT=yes in src.conf

Emmanuel Vadot manu at FreeBSD.org
Sat Jul 3 08:20:24 UTC 2021


The branch stable/13 has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=ba56ee36eb966ac43cc51b52db5fbe568bf2ff3f

commit ba56ee36eb966ac43cc51b52db5fbe568bf2ff3f
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-04-15 12:11:13 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-07-03 08:20:02 +0000

    Fix build with WITHOUT_AUDIT=yes in src.conf
    
    Always install the audit related includes are some part of the source
    always requires them.
    
    Reported by:    many
    Fixes:  8c3eaf244a417a4
    
    (cherry picked from commit f41efc453ab5563cde214cb19273d87e6e4aa2d4)
---
 include/Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/Makefile b/include/Makefile
index 8d50aeea864f..b444184ab8c6 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -223,6 +223,7 @@ MLX5DIR=	${INCLUDEDIR}/dev/mlx5
 INCSGROUPS=	INCS \
 		ACPICA \
 		AGP \
+		BSM \
 		CAM \
 		CAMATA \
 		CAMMMC \
@@ -236,14 +237,10 @@ INCSGROUPS=	INCS \
 		OPENCRYPTO \
 		PCI \
 		RPC \
+		SECAUDIT \
 		TEKEN \
 		VERIEXEC
 
-.if ${MK_AUDIT} != "no"
-INCSGROUPS+=	BSM
-INCSGROUPS+=	SECAUDIT
-.endif
-
 .if ${MK_IPFILTER} != "no"
 INCSGROUPS+=	IPFILTER
 .endif


More information about the dev-commits-src-all mailing list