From nobody Mon Dec 15 17:00:37 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 4dVRCC0Yz8z6L1c3 for ; Mon, 15 Dec 2025 17:00:39 +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 4dVRC94G0nz3psk for ; Mon, 15 Dec 2025 17:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818037; 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=mD5BQBuV5RZ2oZI0vfeBjbIn6O8lz24i+Hrwr1F6af8=; b=LfDUBx8rNuzHyEg5PVnm+oD20JW6XHq0h/YeN6lfPQLv/iBj42xRvIW+naNtyBiL+WqsxI cZGKfW5xzilCHKTCaWUqOxSytt5y574b7TjBpzpmb5tmrTY+N6GoFryJHODGjhR/nc/3m1 SNSuGU5u8KjWhirwDZoA45Yqe1NIwcxBYWFjgKGGipSWZyWK7jh/R0g6DRlNT5qEsO5Svc mabbWtDWoV9mNxaev/J0lFnz8mL1B+u8kzqC9H/o7R8eM6m/w29rGGaZwj8wTCk7irqewy swpQkzEgdMvfizY4bEPWEygTfF+g5v+j1RafZid8VPARFmwhQs+CSGZEaf4dqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818037; 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=mD5BQBuV5RZ2oZI0vfeBjbIn6O8lz24i+Hrwr1F6af8=; b=Jo1hR7rqsBRHpbBb2CWkzNkIf97gN8vDQ/Br9vqMM9jN0MpVjpPR8ruESLeg8BqG9g8KaK z4VwW//xJhvk6qcyUKdEHX7J12U5Gmqsx2qjvlBJYcjWxWz1fCVskwt8/1cvNFCfc432j0 DFS9FpvFMLoIwBNxmT+ZcCYS4VJfacj0sf5mexFJgYIgK48wfJ1IqwlhmG38oTDNZHxlPY +MTCkeMfGg25zEnW+7sAZyDA+bKbnQlKQ0Um3OAeBoCcpn3waWX9AzU4GFdf33hbgQQmwN paoEvv/bXQfO1r0efrc3ACmRctqJuy8FZ9X1+1FIHMNcaCjlieuVLTNfeLCV+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765818037; a=rsa-sha256; cv=none; b=Cg184hvmNdLgAuPdWA3jQ4gNWsGlkUuwuasEl9jbYzvRjfH+0iLDaVcOuLXEXIj6PvlHnD 0NKRxoqRfYa7Jp3wlTtg7TMHZd7mQWNo7XK/Op2+P5CRQ7TQC4BxA7W2LWF1G8w+MXCt51 sFPhvyKs8ObnPpGG3rEIceyO5KtlaI5A/WrAS3mlhWy0cYR1ndKDtGTB1bGSNrkdo8fH3o K7X7x8VWDZlsmySk4UKI6mnxc6F0cmrPRML1pGB5cDAbKmzDIFO27JXwkfHyTKyh9oSDR8 TfWPFA2llXF2GjxlK21jbpm1j3sDE/doUuA7hCChBcIWNBWu+F6Z3P8SUFiTnw== 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 4dVRC93jgDzCwv for ; Mon, 15 Dec 2025 17:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d74f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 17:00:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 3300572ffcc6 - stable/14 - bsd.compat.mk: Honour XSTRIPBIN for lib32 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: 3300572ffcc679457995c8ec4d9eb354cf12defc Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 17:00:37 +0000 Message-Id: <69403eb5.d74f.7bfb0751@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3300572ffcc679457995c8ec4d9eb354cf12defc commit 3300572ffcc679457995c8ec4d9eb354cf12defc Author: Jessica Clarke AuthorDate: 2025-08-22 20:46:16 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 16:58:45 +0000 bsd.compat.mk: Honour XSTRIPBIN for lib32 Currently we only honour XNM and XOBJCOPY, but XSTRIPBIN is important during install. Otherwise we end up using STRIPBIN for the host, not the target, which is normally the same, but may not be, especially on non-FreeBSD systems. In particular, cheribuild will build FreeBSD with STRIPBIN=/usr/bin/strip XSTRIPBIN=strip (with the latter referring to the bootstrap strip in PATH), which breaks for WITH_LIB32 when the host's /usr/bin/strip is unable to process the lib32 binaries (e.g. building arm64 FreeBSD's lib32 on an amd64 GNU/Linux system). MFC after: 1 week (cherry picked from commit ad13dc1ece2fe4a6192bceffea4a868ba6a2e0e2) --- share/mk/bsd.compat.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 0c387bcb020c..f53b1e78a478 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -85,6 +85,7 @@ LIB32WMAKEFLAGS= \ LIB32WMAKEFLAGS+= NM="${XNM}" LIB32WMAKEFLAGS+= OBJCOPY="${XOBJCOPY}" +LIB32WMAKEFLAGS+= STRIPBIN="${XSTRIPBIN}" LIB32DTRACE= ${DTRACE} -32 LIB32_MACHINE_ABI= ${MACHINE_ABI:N*64} long32 ptr32