From nobody Mon Dec 15 17:00:40 2025 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 4dVRCF1dJ9z6L1ps for ; Mon, 15 Dec 2025 17:00:41 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVRCD6cRCz3qCK for ; Mon, 15 Dec 2025 17:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hBUHF8+Z5LwdsCNVMN2nFPScjFgik/f+9N6A8PSh7IE=; b=skasI7m3KSkIDodp6AaQg0xPzyDjyfkUXm1EoUFuIS65bU+MlpoGJwYDRrnIWcifJhV9Dg xOl0A4mGnVmMOXcw1D+Jhyhh/SwTaduFPQ867uxQAzf0t16yjdulFUpxhu6W4a9vFn25R/ dR4t7QE/VS5f/oRU8ZYdkzExZ3ceDGbsUfak4Ph0Rj4BeTqu4Vbxr8t4G10dW3bqO+ATLL 7ZtChKOa8xCEOOjxi83wMXZ/GoTnsjJJ3ICvYd3uQzAOXKW9fHg0X6zf2bZmMNYlZcULkl qd9AawLmfVRi30lf5PU3YnJt/0K3u3aiXP875+zhRxzsCRdCwPsXSisfdhpzaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hBUHF8+Z5LwdsCNVMN2nFPScjFgik/f+9N6A8PSh7IE=; b=p1Hpuw8t9fJtcZ1u7CXNbE4IXgRGWD6Nxuz4sTet3dQQfLE5v4bIED5Tv4VTl3Jkuqwsop PbMsB+3x6fgkKzzaDAidWMNJIqQLS4tfAXRo9dsUvLMn5wBtk9NlozimKIZhiHjlGbix+1 NqHYc0lcyQM0ZsRWRsYPduhw+KeObbc52FUW63vr+URdZfuH7LmIUIvJBJf5uJUJVdRRNQ bKa8dznwJH9pWW5cZsaMNk/iczRBgwLc9MeiwunEFnqJRC2Jn3nToR7F40eKiIIJi4Mmfs 3KKcZJuYj/ACeoJe99KkwvAGD4QW7JZwTYvQn/ggnMk/lheDEZFKfGf4Ywj0ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765818040; a=rsa-sha256; cv=none; b=OWvTerSmuiwCd/FJa5kMatD/AHOH64MRpil0c4i8sgxf+vfg1lqFWY1a3BQynVzVlu5eqK blGI1piw8cmDNiWp4dROXj3zw88XyIN5xHTmj83KLdxguCfZA1aOdthkJfTXP/21VVwY0M aSA2i/V2XCvGpoEsTYcVHu2qRdrmWkXWRciX5y55C7n78IfvVpTRWM7X15s2HEgNC2T5Kj CAJb41kYItBErBopJy1s+Qmnz34yxOI1M/yTPRz+KuSZpsavVyKqSGg4w7nXslW713Mjry dbMOzPD5UM7pGVBt7PBlPVNiX6/eoTfPTpdk4P5WluUmbCRSPKNk85z5GGQuiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVRCD65tWzClY for ; Mon, 15 Dec 2025 17:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e99c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 17:00:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Jessica Clarke Subject: git: 323a47103c2b - stable/14 - cross-build: Workaround system-provided strchrnul on macOS 15.4+ 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 323a47103c2b466099fb72212bf7e3507a856a43 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 17:00:40 +0000 Message-Id: <69403eb8.e99c.2015f239@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=323a47103c2b466099fb72212bf7e3507a856a43 commit 323a47103c2b466099fb72212bf7e3507a856a43 Author: John Baldwin AuthorDate: 2025-04-28 17:10:41 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 16:58:45 +0000 cross-build: Workaround system-provided strchrnul on macOS 15.4+ macOS added a native strchrnul in 15.4. There is not an easy way to detect it at compile time, so use a macro to rename our local inline version to avoid conflicts while also forcing its use during bootstrap. The local version can be removed once macOS versions older than 15.4 are no longer supported as build hosts. Co-authored by: jrtc27 Reported by: kib Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D49893 (cherry picked from commit 4e2616b74cb7eed921aa10fb776cdc2d5fd4e42f) --- tools/build/cross-build/include/mac/string.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/build/cross-build/include/mac/string.h b/tools/build/cross-build/include/mac/string.h index d7db0d3023a4..58464f1f9834 100644 --- a/tools/build/cross-build/include/mac/string.h +++ b/tools/build/cross-build/include/mac/string.h @@ -38,9 +38,12 @@ #include_next /* - * strchrnul is not provided by macOS and the strchrnul.c implementation - * can not be compiled on macOS so just provide it inline here + * strchrnul is provided by macOS 15.4 and later. However, there is + * no good way to detect the current host version at compile time, so + * provide an inline definition under an alternate name. */ +#define strchrnul(p, ch) __freebsd_strchrnul(p, ch) + static inline char * strchrnul(const char *p, int ch) {