mx1.freebsd.org (Postfix) with ESMTPS id 4dVSxj05XZz4Lnk for ; Mon, 15 Dec 2025 18:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822745; 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=aPXxyC1VWzh2iMLYab1gbWG06GHiKyMKTONHR+2vuKw=; b=CURSaDJBissF025x5cRLkVvhZdPcg3n83ty8Ko7DRAcxYwLY5Lc/I2bc8Xvo80fC2kJBCe 3/rqp9h+WoukZmWfi4zbFX8G5rOdl7pKlcBSDGUDQ+a5mdwATjBwaSFUTs8rOdaPYzsCZq WW7gDIXGnz3dG3+ZkF4toFZrC3xNlOVIULqoegvGQW6fVDlrgBO/ki/Yn49S5cNaRYVPHc NVxkXjg+TB2oFCTxUc/XuPAvVHsI3vgjZkOC9uQsU4UEB6QULNkwX4F44P9xAIB6P7Dda7 7E2U9+IbO3XEENTUXQU+5FMCKgVygyE8CwSm7RvfRDkW2eIoVFLsx4/sK6nC8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822745; 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=aPXxyC1VWzh2iMLYab1gbWG06GHiKyMKTONHR+2vuKw=; b=m1MJ2PxbaKsOxJ63n4CrBywQmb9572CTGMIuAZ43sXu0Tkp1eCfD9lRyl2XzA07+7yhzoy E9KrlISAae32p5FOtcQLom9V0EYra2oL5ckGC9UQcDsz0GN8BUlU7G6bp4q3C2fOrQK100 ylmKRZHj6Nqkowt+tLW3tX3devlEFiICFeJpP8JsHTxzQHHg8/ShlUIZ5rQppRMSoVfKRR 6mSJAl4ggIpQaB76elVmNXmxU15luIs286VZmRQL1snyL3RF0PVrjXI5TZYtvR7S5/9d0k gEJYU07dTDfgWXCCTzar+tm60cWVTwaMAYFg10qFA/RnhZOZJy7oscFuH1lbxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822745; a=rsa-sha256; cv=none; b=b4QYJC5hO0AE3jz+J43izkWbU3o5pRGYEp6Ti9/eIfPnmLhd5XtyNPa2Sni/dKEfiP1P3h FzIdH6SJtHMK7L7RZv3+E8UgOcmUrjjFUbMEzTaAAUxjR7yK2mkXegUO5Dho11wV324LG5 m/XlsfsG+vnAheiDlAcY5l4sML9I1QOGQE6QeGJcE23OgddF1Kq7dUZ0ycC29F25z4JW0V ROKm+nF0eSe3zBleSUsMyrAvrTdADSuc8+rDL0a1ZDQxYs4ppvB0JbkW8Pt6oXGh8ow5RC 2kT9FQ+V8NOYrH4y4Gdv+e2g3uB8iO8VMSEAyZycioonNwpWBn5HwqgbPv7I8g== 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 4dVSxh6pt9zWbW for ; Mon, 15 Dec 2025 18:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2575d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:19:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 29e74434e4d0 - stable/13 - bsd.compat.mk: Honour XSTRIPBIN for lib32 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/13 X-Git-Reftype: branch X-Git-Commit: 29e74434e4d0c9b11ef5cbf5c7bafa32bfcddfc5 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:19:04 +0000 Message-Id: <69405118.2575d.4c2bdacc@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=29e74434e4d0c9b11ef5cbf5c7bafa32bfcddfc5 commit 29e74434e4d0c9b11ef5cbf5c7bafa32bfcddfc5 Author: Jessica Clarke AuthorDate: 2025-08-22 20:46:16 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 17:56:37 +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 ef485b843f99..de25b6e941c3 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -87,6 +87,7 @@ LIB32LDFLAGS= -Wl,-m${_EMULATION} LIB32WMAKEFLAGS+= NM="${XNM}" LIB32WMAKEFLAGS+= OBJCOPY="${XOBJCOPY}" +LIB32WMAKEFLAGS+= STRIPBIN="${XSTRIPBIN}" LIB32CFLAGS= -DCOMPAT_32BIT LIB32DTRACE= ${DTRACE} -32