From nobody Wed Oct 09 16:03:52 2024 X-Original-To: dev-commits-src-all@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 4XNyP44xh8z5YjK9; Wed, 09 Oct 2024 16:03:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNyP44BXgz3wdZ; Wed, 9 Oct 2024 16:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728489832; 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=xxYSLSwlOJuVtuhPUrKYbcIL5t6xc4RODLoBU5wUICM=; b=F3DwmnUq8pxw5INQDXFcWyNoXcmvoCG9ShH0gtJ0IY++j/hthFPX9eoryaivdN3oeDE8eX 72H901ng9stO3sSiskKxAB1pOm/aME+EHl2HE2ZWkSYNBEAFA+VTO7rB0lSeaT2h+RiLDo f9n8ElgUqTQ1oPtLavbCciP3sVRrCtYxoSrvHnoJI2Zg24dl4aGK8guF4pbvLyINj6HqBL EUX6ppZKmHJaVnydlaqhgq5dupeUZhaUcH4YyTaiOJDc6AVVTorxo2/HNHmKQ0B/I6E3aY +2o9mtjp51o0FlYNt0DDUF7ESjy/AbIyl+A/M/R0hwVPx2h494wJr9qyirurJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728489832; 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=xxYSLSwlOJuVtuhPUrKYbcIL5t6xc4RODLoBU5wUICM=; b=dSJaPDh98meGmzcn6NpxD6ieWodnF73q4VMASuhaf+7UFUtXKXXhsJl8VRmHIxSHePzKqa G7jl1K4L053EZWBG5qxq7QfTARzHhtxM66GprNkQqoec+GGPlCUBw9JXPDdCQfdbxLbAYW 6P6dTsqH1crBS7rziPDv4vd2tJOblkwHwsMYOpyhOsXMpiah+4bgJf0Z+87rfhxLKOs66U FHBsrWEEmPSuUnWpBppVKqiDQftmrYNQXI4W9SdP21UVZd6UauaJ8Aaf1+t4c1xnnFIe21 CRHapfeR7Vrw/9Lfkeg3PDZ7OLwrB5cpzIyA3iOQchOQGnSDfvOj0al7KoVUfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728489832; a=rsa-sha256; cv=none; b=O5op442SBeuuJ6F0aDiKaSK+oVLyM+7Ebt2QRUJcjM93UlGIrjcE1ek3QNlgGmayQUHJRd 6xrJfYHx+FbD7I8WiII9pLDKrqLW+cnRj+JMw3+e6xsM3H99qwmdcxhy8+XqUwr2i0AZTU f6073gpPkAwNQuFAuzwfdTkgg8Uep3NrPbSRaYF9bQPhdgF0P/h+Kypfyqfm59yl/A+WMZ sx7n76H3mReVBoCK2MiNC7MPBdRpLRBGwX0FyDvvQ1ZVORt3rHJ/zFTgGdNaozHySrbw7N /uD1ZF227dPs4+g7etC47OxPd6wHMe+Crro8BlB9tpM1FakVY6kcDHpk1j5yUA== 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 4XNyP43nhfzL3w; Wed, 9 Oct 2024 16:03:52 +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 499G3qRi014021; Wed, 9 Oct 2024 16:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499G3q2v014018; Wed, 9 Oct 2024 16:03:52 GMT (envelope-from git) Date: Wed, 9 Oct 2024 16:03:52 GMT Message-Id: <202410091603.499G3q2v014018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d5e9faf1f329 - main - mk: honor TAGS for FILES in default group List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5e9faf1f3291d0af9dcdd53ccdaf0971e5d8f63 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d5e9faf1f3291d0af9dcdd53ccdaf0971e5d8f63 commit d5e9faf1f3291d0af9dcdd53ccdaf0971e5d8f63 Author: Isaac Freund AuthorDate: 2024-10-07 16:32:46 +0000 Commit: Ed Maste CommitDate: 2024-10-09 16:03:26 +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 --- 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)