From nobody Sun Aug 17 02:27:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c4KVj0L19z641sc; Sun, 17 Aug 2025 02:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c4KVh6jXCz3Wlq; Sun, 17 Aug 2025 02:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755397628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxKj/Bve0sG4/rNNpllkYQhUf9BN+L5HIQQazonIG08=; b=hcs80P9BDNGKiNr/vB8vH33GameXXO3kLnXHamNFFfc61LymaBGQ/1r9wLCaUtZAaB6KTW AR8bIsq/+OF1BwhaFXuPBXVcY2irfa8hvgJJAFGgCiYF+Y0BHS8pEFRYkREnk68NbQekh3 nHYhrbv5yL/EhmyREXjG5znzLIgCDuXd5+eMummRyKjNE4Hv69McoA8KJ82tLFFcJbVOVy H+SFuOXNcRZ2XgOip4bIn//8O6bvik+tN/5QVuXzXcotiH9YP6rXD+34Q5punT0iywdB2X KjdwhBTrDcLkGTozrgAJEgc0NcRut2XnM/9PTyaX7aPDHCCOo4MGqrxan6fNWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755397628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxKj/Bve0sG4/rNNpllkYQhUf9BN+L5HIQQazonIG08=; b=BTdY3QC8I7qElkZPIBdBpkSREnUnVJRDvD58sjmbHqOPgq9Wxb8+IP7x75u5IEvRO725tO hT1TeyHkJ5/btNNBe4A8Isdjjw9cvKp5Iif9TuVEmfdR3lxSwxxuSZ0hkMbXDrOHlI/SBV at/yPRxF71rkUg5PbBg3sR4HgQjw32TKE6KMBIOLnb/TdW2CmKqBHi54se7XLkoil3xPRl 4XHmPHtWOk12Tf9fG7YRzz94zdir4DJMBC2mWP4vafnEAlYucb/OgBPbBPguVSEHNwzzyX TE+343L0tnrnMJLV1t2Refz9nCT2mOBaRLgqGe7DFpv7DV8wrFInYNMUR+VQIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755397628; a=rsa-sha256; cv=none; b=ZsaIC7ldrtMol7zTjR1Q6CNeEAzFllhqv0M/XbZXw/+badukP3YtAFlbetjoIRpbtUHpnd AVP3elwaSrcrcKp6oGa3431oHW5XRGXOPrhZZJLc791mA8Z4mR/OTWcPq8cu2B9MJOT0Tm kWlhe1nm5RZFGfWll4TPHBm6E5jC4A0MTJtX1+dIioo/VHamXk9s9MrykmMxUtjTqvcC5a xtHioRrWBX7Bl8qHo0Mox1Ky+AVdEHBh/TJ/yFfgsgUB/JZZBncVo5OhTagOmfhrbvYCqw KbRWqBE32Wwln2fdEbRrPuAQ2lLFt56QYGTXjOpDDDELqF69FLZqDf1rvvjwxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c4KVh6JrkzrHN; Sun, 17 Aug 2025 02:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57H2R8xA074956; Sun, 17 Aug 2025 02:27:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57H2R862074953; Sun, 17 Aug 2025 02:27:08 GMT (envelope-from git) Date: Sun, 17 Aug 2025 02:27:08 GMT Message-Id: <202508170227.57H2R862074953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: c6778f3a4423 - main - Makefile.libcompat: Tweak krb5 compat dirs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6778f3a4423743a3f30d8d09bc4e4a086863928 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=c6778f3a4423743a3f30d8d09bc4e4a086863928 commit c6778f3a4423743a3f30d8d09bc4e4a086863928 Author: Lexi Winter AuthorDate: 2025-08-17 01:19:21 +0000 Commit: Lexi Winter CommitDate: 2025-08-17 01:19:21 +0000 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 2fdc1439b916..d165bba341c8 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