From c6778f3a4423743a3f30d8d09bc4e4a086863928 Mon Sep 17 00:00:00 2001 From: Lexi Winter Date: Sun, 17 Aug 2025 02:19:21 +0100 Subject: [PATCH] Makefile.libcompat: Tweak krb5 compat dirs krb5/util contains both programs and libraries; trying to build that for compat confuses bsd.prog.mk and results in unwanted files being created in the source tree. Remove krb5/util and instead list only the directories underneath krb5/util which contain libraries. The libdata change from the diff isn't included; that will be fixed in a different way. Fixes: fb13ae28b2e8 ("Makefile.libcompat: Add krb5/util") Reviewed by: ngie (previous version) Differential Revision: https://reviews.freebsd.org/D51937 --- Makefile.libcompat | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index 2fdc1439b91..d165bba341c 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -93,7 +93,11 @@ _LC_LIBDIRS.${MK_CDDL:tl}+= cddl/lib _LC_LIBDIRS.${MK_CRYPT:tl}+= secure/lib .if ${MK_MITKRB5} != "no" _LC_LIBDIRS.${MK_KERBEROS:tl}+= krb5/lib -_LC_LIBDIRS.${MK_KERBEROS:tl}+= krb5/util +# Only include the parts of krb5/util that build libraries, not executables. +_LC_LIBDIRS.${MK_KERBEROS:tl}+= krb5/util/et +_LC_LIBDIRS.${MK_KERBEROS:tl}+= krb5/util/profile +_LC_LIBDIRS.${MK_KERBEROS:tl}+= krb5/util/support +_LC_LIBDIRS.${MK_KERBEROS:tl}+= krb5/util/verto .else _LC_LIBDIRS.${MK_KERBEROS:tl}+= kerberos5/lib .endif