From nobody Mon Oct 21 19:05:12 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 4XXPrm56vnz5ZfdX; Mon, 21 Oct 2024 19:05:12 +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 4XXPrm4242z4Scm; Mon, 21 Oct 2024 19:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729537512; 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=Ja3WfkqdBHzTnc7IcGfpA3Ri5UP+tFhBQZJnWtkTb5k=; b=vqI8Q4IoMtyddnLWb19gz6U76N1n9i3uNcLg261Ph7ady8MPwDT7WQPRBKrMnTNb3PiZ32 cf9NLKJHRr8pB+ihVI/5h7Ef/8MJwSPadZXLU5C7f1c2ABPMGGhGF/2p5cuawG8EovUS7p E6GAH4c/W3raiDyHgx0OokbkCIDlWJ8pHZbhYDDEqHgsMpNSptTBm8XLXojzcHDxmGNNvw iWjX82fhQzpguKtE063K8JEuZITxi9UOMo7IdmR/3TrdXx8ZoT25hpDokj4NOsu7jSEjbR gBzDDjowpKC+++k7c1+9hDc9dxmXd/L+E+RMVU3VNxRxGXFcZ8H2em+Hdsrpug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729537512; 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=Ja3WfkqdBHzTnc7IcGfpA3Ri5UP+tFhBQZJnWtkTb5k=; b=PAADBxMVYNsSutmG2drplTF+92y2ognyKGyq8JWEJUpw4LJgQQ2L5Cpkws9VKVtbD739oB yw8wGC6zGd57yBc0R2VBC7TRhPQWkrC1mmQLjbIDd/afn2Zwvv2PVi/yaT9W12KesQCPZy J1rRWDObjUTQZyNqy77FA2mjQ5xjnl0nhHSSWcEY9ZAJJ/dfVd5nJyKehLIgNSK8EN5NrF 1RdW6MTNOx3FHlFMwECTLFfFNQ/PsJDmDBoqpVD6f9oZ3zQDj4z0spxzCQU75wW9hZbSKs H2yASiJ9yi6WdHRNjfv9+tboSfgaqVhWldh4EUrptg94Wb8fMF3tgqNP/hef3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729537512; a=rsa-sha256; cv=none; b=dGwWjsU5eJZgkrHKjHxXPRclbOSidi5ZJy2umQ1jTDYCv2QNA+dIuFSRsi8QKwhLyIXkJC xqZA7TbvJIHfhZkoiloPFrK4jTR7xBgiJF0F/GWtZWkND7qUwJlPTIYOpmh9GL+nKWC3XW B8jCrI4SesoLg75agMvFDO8RgpdG3gAFaRMfhhCxgabNZc22YBL4Z8as4gJCbxq5IXqZBV 3MLWXQdPc4OWjjGH66M7s3qQgcz5SbyvxS6JXA9QQRx3YSx3qvjQtziN3mieufijm9a8UA vRlHbu8TgELIbfCD2M4scKR0P95b7ko0DSZJq3k6kUvq483KiPG7of1iEhEHkg== 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 4XXPrm3drNzhmf; Mon, 21 Oct 2024 19:05:12 +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 49LJ5CjH092364; Mon, 21 Oct 2024 19:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LJ5C4x092361; Mon, 21 Oct 2024 19:05:12 GMT (envelope-from git) Date: Mon, 21 Oct 2024 19:05:12 GMT Message-Id: <202410211905.49LJ5C4x092361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 85b6bfaac925 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 85b6bfaac92551716cfece08137c3cb4d2261521 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=85b6bfaac92551716cfece08137c3cb4d2261521 commit 85b6bfaac92551716cfece08137c3cb4d2261521 Author: Isaac Freund AuthorDate: 2024-10-07 16:32:46 +0000 Commit: Ed Maste 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)