From nobody Thu Jul 16 22:02:01 2026 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 4h1Rpd6kbnz6m0Ww for ; Thu, 16 Jul 2026 22:02:01 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h1Rpd6F0Gz4004 for ; Thu, 16 Jul 2026 22:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784239321; 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=xlIDVoOama8sQ9qGdQxhhJlc5BONlIYOA9C5HGPD+EM=; b=t7pcam9/HSmS6BKH0JOay8nWdydL6GPZBWoqQfHfeuFNJzVgPOZgrtPAVN4abUuyKgyD0i 58AhkvJ9UlLNnZAs3j3mUkx/d4tvboHuuJV8MtZCJHA0pW8trWFk91sr8m3H9qs36gtWTO +zRCpUyoCdlmU9J+NpCRy09LPqj8k0JTfqD9bKkUHHpdJdve8Qou4NVmNCGC0ZS6aqIt/E bkLehyRK4s81BQWmoT9zvRb8UfqenzETWs7ME7qf34pYIBaDE5bB/DSMpaAgZLT97YIpTk fvfJjgrDlGa1YvH3XDA6kH1IFH+cRtDqp1q3VOPapY7GjK/6LupGDkzi+7oftw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784239321; a=rsa-sha256; cv=none; b=pIybSgtRYtR8R+2Mmmgk0T0It/hC8lKPNffMGpcmtiJlVONxIryheZujhSw/ufmPTIAJZt CcJIoZgN49rhfudN7OrlgsrjQTS6wHIc/Yend/x8zgRgQ/ZORVF64SqDAXcp//mTGLfEsT HuUSAclS3h4/NWelVCxVfM0GAma11fXnDc+wtnFIEv7kQrqBFrzM7y8L9lPDDq2cao3wz9 sHxkD+bulF/XZtcNf6O66mqeGJPFl8EiFS6ViYo98Y+HdvU6uC2Bz8zmOSh94MMfA6vA/c Men3lbGz702rup7O58OZCkpEiXbYvyCu9lmsjwydmOWQ/+hxtM1+ogC7IQrTtw== 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=1784239321; 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=xlIDVoOama8sQ9qGdQxhhJlc5BONlIYOA9C5HGPD+EM=; b=dMaeOc0SZfKnOtW8SG6YlPgtnuJI7zGExztPDmuSH+9gAug5PLytdd+uyFwFqcC4HTl0hi yGOiKvNGn6+/VVyTtEvQvHLcfOEpOk2mAOKykLFvswDgIUp6B5VAbkPKvXvbOBmrtG5uRb 98w2HON4NbFrWCg140jFdJYfgJmrTjV5yOBGGOyD0HEVuL+IWI7uDenD20C1scEA67FBq7 takPc280BCa2mBpxQkRWuNQu7oOzo8Yc0565lZdEZx4VHIeomkiYoR8bmcit3zAyZ8CLWl w+xM9CrUwMLsxQaXS6iKzApsx8CH+cJ1cPBoccllWPzjWGuFLYPT5gcQ7hHkjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h1Rpd58GNz4jZ for ; Thu, 16 Jul 2026 22:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cbf5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Jul 2026 22:02:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: f2e6a8b9e50c - main - libproc: link against libctf if MK_CTF != no instead of MK_CDDL != no 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 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/main X-Git-Reftype: branch X-Git-Commit: f2e6a8b9e50c7552037cb635f17b955ead84a813 Auto-Submitted: auto-generated Date: Thu, 16 Jul 2026 22:02:01 +0000 Message-Id: <6a5954d9.1cbf5.11c67d34@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=f2e6a8b9e50c7552037cb635f17b955ead84a813 commit f2e6a8b9e50c7552037cb635f17b955ead84a813 Author: Enji Cooper AuthorDate: 2026-07-16 21:48:37 +0000 Commit: Enji Cooper CommitDate: 2026-07-16 21:56:29 +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 --- 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 670c4399f63e..2a475c292975 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 e1ffecddc25a..b3c4e1861e24 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -412,7 +412,7 @@ _DP_pam+= ypclnt _DP_pfctl= nv _DP_pjdlog= util _DP_proc= cxxrt -.if ${MK_CDDL} != "no" +.if ${MK_CTF} != "no" _DP_proc+= ctf .endif _DP_proc+= elf procstat rtld_db util z