git: 85b6bfaac925 - stable/14 - mk: honor TAGS for FILES in default group

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Mon, 21 Oct 2024 19:05:12 UTC
The branch stable/14 has been updated by emaste:

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

commit 85b6bfaac92551716cfece08137c3cb4d2261521
Author:     Isaac Freund <ifreund@freebsdfoundation.org>
AuthorDate: 2024-10-07 16:32:46 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-10-21 19:04:56 +0000

    mk: honor TAGS for FILES in default group
    
    Currently the lib32 crt files (/usr/lib32/Scrt1.o etc.) are placed in
    the clibs-dev package rather than the clibs-dev-lib32 package.
    
    The /usr/lib32/dtrace/drti.o file is similarly placed in the dtrace
    package rather than the dtrace-lib32 package.
    
    Splitting shared libraries in /usr/lib32 into a -lib32 package is
    handled in bsd.lib.mk by adding "lib32" to TAGS. However bsd.files.mk
    ignores TAGS and only honors ${group}TAGS since 144c442.
    
    This patch changes the behavior of bsd.files.mk to honor TAGS if the
    default FILES group is used. This matches the handling of PACKAGE, which
    is also ignored unless the default FILES group is used.
    
    With this patch, both the clibs and dtrace package are split correctly.
    
    PR:             249145
    Reviewed by:    bapt
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D46991
    
    (cherry picked from commit d5e9faf1f3291d0af9dcdd53ccdaf0971e5d8f63)
---
 share/mk/bsd.files.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index 517ecd44f2f3..a330a8dddbbd 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -39,6 +39,7 @@ STAGE_SETS+=	${group:C,[/*],_,g}
 
 .if ${group} == "FILES"
 FILESPACKAGE?=	${PACKAGE:Uutilities}
+FILESTAGS+=	${TAGS}
 .endif
 
 .if defined(NO_ROOT)