From nobody Sat Oct 4 17:52:49 2025 X-Original-To: dev-commits-src-main@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 4cfCmd3mhDz69S2w; Sat, 04 Oct 2025 17:52:49 +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 4cfCmd2qKDz3dRj; Sat, 04 Oct 2025 17:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759600369; 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=F7qD+61jPx7+32YvNVi9V0kp3gna4ZCqTCgRmACNv3U=; b=PPPfNJAkM1MCwOB4SmcwrTQWajkHs31RSytqp7IBPM4qxe88tB/QBEtV9SQ1t6oX5M7aCj 5mqLo18zz8svTJDIdQyo/sAfK2S0qtf1POounLN8eWSB+ddVol1gvcPmeJkE51L9nGWnzW t7QJ2WaK04QH+a78T7GLM0XX5BJSmJB0ViJXpWP+PxTYEqkVndx0dEny5xuAOblgojrq8C 1ghqogXVbgtn95buM6zihAn2iawp5trBh+ZGTsbr/znuWkR6CA+bIychFLHj3wqsUyYmHE K0RmI5Q1khqVkC6crX37nIhWJmkJ3yLrWO0liIccRYq7T2f2ic9N//mqlovLIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759600369; 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=F7qD+61jPx7+32YvNVi9V0kp3gna4ZCqTCgRmACNv3U=; b=pDnAMz9IPaOgL2S0+NP6RdtoVl2y65N9U7bPMrcBX2bxkXxIrrRYsBNwEAPJuOJ/8pAfKz hU+TCUD9TBKdWNWYC2KOaOMt/wqdnAsJufQaXPzM8crks/yORjKQBbSSt3i9Xjg7RrGzco kpJSEm2oOXMjvcN/iTBXelXLpr+6UIe9t+TUkaL20Tef7KYpauCTFcVBLyx0HhQlU3aB8T pLHYnMHLjnc4ACqmn4ayBayMYfAp6BXwCUDL+saSL3R2DoZF986u895AeKP9hn5YONZI6N sCVLH2gEu0CQt8MAcDAbZHypUMTp1D0s09CZSExyIiDdL9MSoqVyzXej0TNo3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759600369; a=rsa-sha256; cv=none; b=iUqt7YCn3JpQgIhPV+EJIpoVJbjhEHa/URd1xrSvYYbgjK/1smEViMy8xbLIZPeAUoUM+l Wa0KJhPfN1K2CQbmR42F9EcXsm5EG6oL1LUUjH4TkNEw3cOh7xSeSmM/H6jTSJr5r2DtJ1 UosMhxH49b8+PbZezyJhN2px+JTJd0khTbyXhnnEvARlrWL1MylVheJYRKmeLQLDpMnTyM 656OnfFD+lnpQruY5wwyK1GIOSEYrmfxkGq38z48ZhFA8B6O3YO+FT5Dy0uF8hyA7EYPyx zyx56+h4l0+oTd1JrNTfAKM7hraIN3bJqjTz+jtygk7Yy0MNN9zKXDnogPVkcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cfCmd2P5bzshd; Sat, 04 Oct 2025 17:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 594HqngH090036; Sat, 4 Oct 2025 17:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 594HqnZa090033; Sat, 4 Oct 2025 17:52:49 GMT (envelope-from git) Date: Sat, 4 Oct 2025 17:52:49 GMT Message-Id: <202510041752.594HqnZa090033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: b09dd586518a - main - Makefile.inc1: Fix package-pkg with CROSS_TOOLCHAIN List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b09dd586518aaa0ac24b70ca522f4054165c8031 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=b09dd586518aaa0ac24b70ca522f4054165c8031 commit b09dd586518aaa0ac24b70ca522f4054165c8031 Author: Lexi Winter AuthorDate: 2025-10-04 16:50:56 +0000 Commit: Lexi Winter CommitDate: 2025-10-04 17:52:39 +0000 Makefile.inc1: Fix package-pkg with CROSS_TOOLCHAIN CROSS_TOOLCHAIN is used to build src with a different toolchain than the bundled one. Ports also has a CROSS_TOOLCHAIN option, but it has a different meaning. When building ports-mgmt/pkg from ports for the package-pkg target, unset CROSS_TOOLCHAIN to prevent ports from being confused. This fixes 'make CROSS_TOOLCHAIN=llvm19 package-pkg' for the native target, but cross-building (e.g., targetting powerpc from amd64) is still broken due to an issue in pkg itself. MFC after: 3 seconds Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52902 --- release/scripts/make-pkg-package.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/release/scripts/make-pkg-package.sh b/release/scripts/make-pkg-package.sh index a1e006bd6964..3a1b163bd591 100755 --- a/release/scripts/make-pkg-package.sh +++ b/release/scripts/make-pkg-package.sh @@ -8,6 +8,13 @@ PKG_ABI=$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI) unset PKG_VERSION unset MAKEFLAGS unset PKGBASE +# Ports interprets CROSS_TOOLCHAIN differently from src, and having this set +# breaks the package-pkg build. For now, forcibly unset this and hope ports +# can find a working compiler. +if [ -n "$CROSS_TOOLCHAIN" ]; then + printf >&2 '%s: WARNING: CROSS_TOOLCHAIN will be ignored for the pkg build.\n' "$0" + unset CROSS_TOOLCHAIN +fi export WRKDIRPREFIX=/tmp/ports.${TARGET} export DISTDIR=/tmp/distfiles export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES -V WRKDIR)