From nobody Fri Sep 04 06:01:35 2026 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 4hbm7S4xfXz6r75S for ; Fri, 04 Sep 2026 06:01:40 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hbm7S2Swqz3YhR for ; Fri, 04 Sep 2026 06:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788501700; 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=WycCAFif/Cc2OjEUMHTSwAxnyZNwnTqneDDLLNAzKRo=; b=knhgZKUBsxi+tpWFPGnq6QJkCHGF2CKYNiLFZhA0jCIVThVRqF1vzyIcAtgV8kirzjCC0P rUC2EKD1V4CiXzznfYuQjWJWGRKcYHkXGl9srO2HtbjRGkAjTsfl0toqMSLwl5+AbcuiRG IcJSKq78fmwpPTTWOlhyajKG1lj7l0bEBvQqq3E5M90W0W/51vwP/k8lV/iM2negoRuBMr lqdhEIWUCc7BsF3JLup9Y/gwBDTMv+wwxAwK8OMUCdKUNaBZRb0fDkVI46KtOCGKxUs7Iy PeLl3592FgM2gys1FHA45wr/KZbZ7LI39AiabDdHTL7rfcCj7jW/CMYt6g9g4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788501700; a=rsa-sha256; cv=none; b=AbpN0FJTl7+M0ZsBLCoUZSYX/HnohZ8TnXlC/OvfxCBpv5Y9pVe7VaqN1jSexkezHwO0El nTvznwi/d4DmkdELt5AqTScJ6n1lucUrH9ZhC+4HCsF/ZoO3BSnTNxpurFoY3jN2Zc0ua/ /zUnstMbQ3FRK1WwYfzuWHPowzfiDtkLXRDL8C7vIJEeukDkUKmJEB57wzwVu5Uvxzt6u0 FZS+60+hQl6YBElj+0FFJq0vpBBYK1Gz1kgVsX5xg2EilL4g03KVEm9L+1EVN8qw688yxM PwKNcVljbalje2pR3YRZMYx6OtaL8P/9favIT+FXZRtGCAKub0qSh70rknirjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788501700; 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=WycCAFif/Cc2OjEUMHTSwAxnyZNwnTqneDDLLNAzKRo=; b=Wtgj/ldHAFc20E/OWzpuV6yRp2lVTBoJ4njGyacPlrRStLie0y01y02Y/GzRerveG+HVGa 9g319FEJflm1S305aSrFpL4zdBvmojp6J2R2AFBXNggHTqKmi4pAgoqPLZbjQOBsVYjrNW NwP40PL9lGlHiGzgJkaCVR3XfR5XrNWN+qNLpV05+9D1OOZLoiT9Qy3xPomm9o5yXNk7B3 V2CbMu3ZcrHwbEEZqQCsJn8NvzwdAjNqt9BVz93wC0qSZzs4FKwTJoCzkicIo0K545CmVU eSWuow3PduhPChB0/Z76UQkGsbbkQoTRbMeWgwMblgl6mu8e39U5iGmylrK0tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hbm7S11T7zmq4 for ; Fri, 04 Sep 2026 06:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2197a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 06:01:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 7d87c1ba6c4a - stable/15 - libproc: link against libctf if MK_CTF != no instead of MK_CDDL != no 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7d87c1ba6c4ad73d02ffbfe7dd67c1bcf7c392f1 Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 06:01:35 +0000 Message-Id: <6a9a5ebf.2197a.37efb50c@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=7d87c1ba6c4ad73d02ffbfe7dd67c1bcf7c392f1 commit 7d87c1ba6c4ad73d02ffbfe7dd67c1bcf7c392f1 Author: Enji Cooper AuthorDate: 2026-07-16 21:48:37 +0000 Commit: Enji Cooper CommitDate: 2026-09-04 06:01:27 +0000 libproc: link against libctf if MK_CTF != no instead of MK_CDDL != no Logic prior to this change would incorrectly try linking when MK_CDDL != no, instead of MK_CTF != no, which could result in the library and the tests being broken if/when MK_CTF == no and MK_CDDL != no (an uncommon, but possible combination with today's build knobs). This change updates the conditional to correctly track the value of MK_CTF, which in turn is properly toggled to no if/when MK_CDDL == no as it's a dependent build knob. This [niche] build bug has been present in FreeBSD since 2014. MFC after: 1 week (cherry picked from commit f2e6a8b9e50c7552037cb635f17b955ead84a813) --- lib/libproc/Makefile | 2 +- share/mk/src.libnames.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index 41643505f999..d0cbbbd79d55 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -15,7 +15,7 @@ CFLAGS+= -I${.CURDIR} LIBADD+= cxxrt elf procstat rtld_db util z -.if ${MK_CDDL} != "no" +.if ${MK_CTF} != "no" LIBADD+= ctf IGNORE_PRAGMA= YES CFLAGS+= -DIN_BASE diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 945df60769fc..205b8e42662d 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -376,7 +376,7 @@ _DP_radius= crypto _DP_rtld_db= elf procstat _DP_procstat= kvm util elf _DP_proc= cxxrt -.if ${MK_CDDL} != "no" +.if ${MK_CTF} != "no" _DP_proc+= ctf .endif _DP_proc+= elf procstat rtld_db util z