From nobody Sun Oct 5 05:33:52 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 4cfWKY0fdFz6BdM7; Sun, 05 Oct 2025 05:33:53 +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 4cfWKX5Rwpz48WY; Sun, 05 Oct 2025 05:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759642432; 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=/WeKxaCOKgF/pYQkDqMqf69g6Oii/OkaEwpfdrPlsns=; b=dwymMiLyx65HKl4gS10HCbPqL8oRIyGqLssWvI+OYZfQ4DHliT7AMGXM/60OQB5sQ7VlEE 6fybI5TaGmy3orY9mKeys5llFV2ubHdmu0xPrIm/W2o+EbbpibCkEJL2wrZEo4bknJhJ+S EwCnESjAQeXCnpkmxsyLeTLpkf1JC8BkOOp6h815MoW4yxBc78vvEep/X6NKKNrK48oRV9 8P6d45I8sML6YYx8x4ktEDkJGT0j14WLe52r19/XCLoe1X46n+zhlL/EDXEfysiQe0NBSl 7rdo/JRLcJi5qEcEQCLY12ow0lcXaeWmaaOhM3qhPPSSCsNRyaxeQVEmTKXlZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759642432; 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=/WeKxaCOKgF/pYQkDqMqf69g6Oii/OkaEwpfdrPlsns=; b=eWo2oSgqJSviNz6cXZsbc8+vyrVD33T9fMIQSuU5COIWFlj+fIxaffI22s2Ouafd4YL4ni BLR4gS5yhqQTVZb77FrRih0RwvuTGMxVSegD4qm1daLFJkGK8JU+T0drb6Jr01gRz1dLrN b8Y+T+Xmn5j5WSJbTuGUc5cfwtGE2YhbvnQ0TLIEDkUQKpddVntLVUVEmvmLJgakhoFUIb SJmBTEYBAM3bOroqBWbtIIXFv+8Jtx4aBObJW3L+CxxYq/7S0bQSv5cyu4qF3Rmsq85I0/ DIF4u4jM+a4Q4P/ZBvD3Lg6lItBtAmejA6vZHHVrdDJHiUbDGlzznzHTVpK4PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759642432; a=rsa-sha256; cv=none; b=F/ghoCRxaAJQBMaagjXAOsxYD7NpFFpAGdWAxStPwmwLgmLN1SW7Q4KCuObJE55NREHo01 jc6SeqcO4ZVMFG/YL+jlTxS7YkKXlhZjcNxtWBp93hx6TVZkGuVlNm+hs7TkkJFlFWg/LI lIsdNe4bRYFID9LngiZPTM/f32QZ+Lo1HF8Kn5RyNRYopN4eU+Rp1j99m2CZzsENihD3Sc AGRWDr3WNBpoV5pQ8C6OhD5BHJApF5l3gglrS+HaLLg3oCAVjB4EEui6NrAQnCR55ZWqPj gigTjbSAfrhobQOMdYyPXLHDOrAs7Gyb1TcsD2ytNmkqbukjQpG3Mrcwkkse2A== 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 4cfWKX4ySpz1DPt; Sun, 05 Oct 2025 05:33:52 +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 5955XqBd010600; Sun, 5 Oct 2025 05:33:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5955XqmI010597; Sun, 5 Oct 2025 05:33:52 GMT (envelope-from git) Date: Sun, 5 Oct 2025 05:33:52 GMT Message-Id: <202510050533.5955XqmI010597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: e42935e5871b - stable/15 - Makefile.inc1: Fix package-pkg with CROSS_TOOLCHAIN 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e42935e5871be01246133674427c682fa152a5fd Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=e42935e5871be01246133674427c682fa152a5fd commit e42935e5871be01246133674427c682fa152a5fd Author: Lexi Winter AuthorDate: 2025-10-04 16:50:56 +0000 Commit: Lexi Winter CommitDate: 2025-10-05 05:25:04 +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 (cherry picked from commit b09dd586518aaa0ac24b70ca522f4054165c8031) --- 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)