From nobody Fri Sep 04 06:04:01 2026 X-Original-To: dev-commits-src-branches@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 4hbmB970xDz6r76l for ; Fri, 04 Sep 2026 06:04: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hbmB96V2Hz3ZLV for ; Fri, 04 Sep 2026 06:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788501841; 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=4+NxNtIK1Q75S0YlYI5jEuOjoDYENzeUpsqJJaou+4w=; b=CgkVMeE3m1Xm2zOwNZKlrPVeOA9Q8GW29zJjZcch3wFsZxs5UU4A31u2xlsYds/YNkdq5y bGVlMbuP8gNspNbLZBj1WWVKyWyGJwIbMORael25eGl0QRSbf0mJ6hXAlymS8STo8h2WTT 8mcs3MdpWzMYkYdjubF8brRcQva/kUZ1mwWw/heoZiUZE09UE2083DhUSHzam+Qy0dbuSt +zN9wePeM/jV/l2McJl/NPd159EZGQO7kR9sE/615kxWl9JNYtk4txPf/lfUpqEvYiN8zB m/0/nFQqcNrgSyY4o3MIKrwCDsOjHFs3omRT6MNS21V/Zs6OOY/7BSWU/VGG9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788501841; a=rsa-sha256; cv=none; b=BnidxL/YL9TAoid6AYWLhONBSlThwA8EZTvom9YwWFQeKlP1uqyLBb/3Du9zOC3uKvFEeF VuXy5Q2TopdkubZwnytzL5SDRHrKurtV3FIcianzbuc7fV4EmyEIyJlRsPrdtwd+NdHIDJ lKEZM/7MfboHndqL1+89O9HmM0H8MqUcd71GIRDK1eBefHUTm3XzIMORmQLaI1mWKhXp1H wsO44ldJDCj9No/UC3qPo0INMjosFP8wUivGJXc73OIyyaPKsh/E5helnmdFY8rNc/cJke IeRKvNY/B5uZyIbqsRXIDIigkg4dmkFUdRvYUtme5nVBlVMcA2F2Z73HMqoG+Q== 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=1788501841; 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=4+NxNtIK1Q75S0YlYI5jEuOjoDYENzeUpsqJJaou+4w=; b=QK1a+imit5CgSjTW3SWvGpdFdwQ8RaAe2CQ4w6B8Zw6aKYyZgm/HGkX+Wim2ftZrGbAvXR yD+5t40z+AeyfdC7K4UgLxh99zjXMyn/EvXrL0tAcsbWzEUq7YodJtHhWmH6ajfLvu7avB 9UMWSwesFrRqrrJ4AYaU1i8AWkM8DiBg+ljR0TbgQGtG3jevAh2/IfdFD7N3DYf2K//fGw BBto/I2MMzg+MfajKzC7px8nul8TqVPdmWO9q3Eo599d+rPyIZD+miNQLDGf/x0K5D/reM ih+HPe7JM/dbdMHcOd9dAselBBXhir8/IJ9m/Deog8I2UizdY6EZ7xUHpdpdQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hbmB95Hb4zmsT for ; Fri, 04 Sep 2026 06:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21a86 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 06:04:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: c4df3e37784e - stable/14 - libproc: link against libctf if MK_CTF != no instead of MK_CDDL != no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: c4df3e37784ebc5a0e4095f401aff80dc0a6e5fa Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 06:04:01 +0000 Message-Id: <6a9a5f51.21a86.161854a8@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=c4df3e37784ebc5a0e4095f401aff80dc0a6e5fa commit c4df3e37784ebc5a0e4095f401aff80dc0a6e5fa Author: Enji Cooper AuthorDate: 2026-07-16 21:48:37 +0000 Commit: Enji Cooper CommitDate: 2026-09-04 06:03:15 +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 67c4e642ea00..5c955596e28c 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -16,7 +16,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 c6e3d1bcba39..72ef522c887c 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -334,7 +334,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