From nobody Thu Apr 2 10:03:23 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 4fmcqw0f5tz6Y8Ff for ; Thu, 02 Apr 2026 10:03:24 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmcqv6TzRz46TH for ; Thu, 02 Apr 2026 10:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775124203; 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=L5hFqqeoNKkihDhGB9xxU39IG1SuMMt3WDOI/2iZ/E0=; b=rVouh/9rpNgMr9cnA0oYIZLbO+d6r+NKWlCT83cvhEqYGjhA+qdWA1CJM6Drwmzb/DDiL7 8SP2sSglma+Ex7F+PKZqjg4RtMphp068ffCUHamWbdUy8IPXpXrqiqADq6uMUFT1ojjpZj OJXajdQkhc4UClE0XPmmxT08LgVq7JreTIl76rmS5EuKyLbRLj5iKvEeHnzcug0y2+6cQH Vjzdq2omI6N9uDaJi2hnfAPIcHvUXWl4IRl3IdF21i6weLwWnhkHCv+UBUGMSX0GyGaMua 4qY0AOiQTjPcVu8KMkrmxXlmGS06pzeRjGaBcI9ym57Lg+IyRvHHHNz7exT/pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775124203; a=rsa-sha256; cv=none; b=l7sK5+PcmXYx4b8vgjDJFXf7gFLYjUg3Zw5UsWxfe6C3tqAz6aqk7yHXNfzDHxDT47IupF qCQVceP6w2peZsSr/+9pks5/cHF+jBJRvdnR4S5hBPh9bk6tE8IT/A47tUUNWV+xT4nkBT 8WdzshbIWGlX40DZu6IhTunztPx1LVa7IvfO1NpFRw/kIYPom04jiVZ+osOCYegsbzz4oR xsksqtjo4Y40DdeadiJjgSuVVyIKb6oYjZ4AKsk2e9mOylnfge9JN6mPBOTawmbPI+yqBl 6al1EQXxL4biz1xnZI+n4olrOoLw0zleKhT2nv/UIVaP9cLWfQacI+geDQ7wIw== 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=1775124203; 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=L5hFqqeoNKkihDhGB9xxU39IG1SuMMt3WDOI/2iZ/E0=; b=A3JZz6ViBaKoG0TAmuRm82TlTgv7a7lRXbn1t7n85WKoljjtDOt/9jeIkCzaQbscYh4FVo oDHtX8lZ6BEUJu0k7Wka+xsMMGkGX3Zn3pwsrJzeht19/ARXR/FNADG0d0Hh6+wU666uNW 1MuNC0IDwWbxUZAwFOtACZeRE0voQMwDCsMupWj0ijz+9Pgga8o92R4N2m2FADyXf07si4 UxPB2B9xyG/eTpQhtf+fTzkL0Rix/I+BWhU2mkdGyPUZ1dzXFcgdU/8+pZCeVGaBFnl78t JE4HbLIx4wWCPEx32aepe/5Z4piLSiVpZ6yS1bpkwx0heou+Fy4z5qgkZgP6OQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmcqv65KNzxR7 for ; Thu, 02 Apr 2026 10:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d0dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 10:03:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 2bc5bc14a8b2 - stable/14 - cross-build: Provide mempcpy when building on macOS 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 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: 2bc5bc14a8b218ee876bf43a16ef15abaff83e7b Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 10:03:23 +0000 Message-Id: <69ce3eeb.3d0dc.5c50e619@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2bc5bc14a8b218ee876bf43a16ef15abaff83e7b commit 2bc5bc14a8b218ee876bf43a16ef15abaff83e7b Author: Jessica Clarke AuthorDate: 2026-03-23 16:56:09 +0000 Commit: Jessica Clarke CommitDate: 2026-04-02 10:02:16 +0000 cross-build: Provide mempcpy when building on macOS We could patch the tzcode config to not use it, but it's simple to provide an implementation of it and avoid spreading cross-build bootstrapping special cases. Fixes: ff2c98b30b57 ("tzcode: Update to 2026a") MFC after: 1 week (cherry picked from commit 47402c9422ec6c9ba76d96414f5a08bd35a9e1fd) --- tools/build/Makefile | 3 +++ tools/build/cross-build/include/mac/string.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 51a349ac0277..98ee8b5bda9c 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -223,6 +223,9 @@ SYSINCS+= ${SRCTOP}/sys/sys/linker_set.h .if ${.MAKE.OS} == "Darwin" # Standalone implementation of secure_getenv(), not available on MacOS. SRCS+= secure_getenv.c +# macOS currently lacks mempcpy +.PATH: ${LIBC_SRCTOP}/string +SRCS+= mempcpy.c .endif # ${MAKE.OS} == "Darwin" # Provide the same arc4random implementation on Linux/macOS diff --git a/tools/build/cross-build/include/mac/string.h b/tools/build/cross-build/include/mac/string.h index 58464f1f9834..8a36bb1f392d 100644 --- a/tools/build/cross-build/include/mac/string.h +++ b/tools/build/cross-build/include/mac/string.h @@ -37,6 +37,8 @@ #include_next +void *(mempcpy)(void * __restrict, const void * __restrict, size_t); + /* * 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