From nobody Tue Jul 28 01:50:29 2026 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 4h8JMG758Rz6mHsq for ; Tue, 28 Jul 2026 01:50:34 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8JMG6f3Vz3kk0 for ; Tue, 28 Jul 2026 01:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785203434; 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=UVpr0+i6+7BU1haK1HUNnt3NKp1AZtmxIiniRrrZcE4=; b=jIocC1Y1vlKcYRb02ypQbKuWLygXuSvks+D2XVmaAyxXPhx/sV93UX67lkbDK3qqZyVAIY WDjyCxkCMKEP0cFtZsIMtQauHmM0BuQsr5mUES1LuMiA7yHQBuUCoMLAZH0p4UdqSs7t9/ VyW+HmvpYcast0r5islIQb/yC7yXG6tv8LoVI/RObcmFuzzr3ft36/T49LVZ+1Dl+lQ0fR bi1tkZBNayWnWd5zqk1TqSa4PDlz6wbzihoqdbxnnZ/uEqQ9yY1R2f48KamULzcuA/atrA aRWFza1ak86FnV3bUytEiXhQs1VCQXjKCkVsGzIx8RR/mP0EQTy49Sq54pIxXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785203434; a=rsa-sha256; cv=none; b=IJ/ROhKmPL0NV3lSk1bYAl2tNyXLgMDeU8x5bvuviyXGSJgBfFyVkNtypLox3g+o4Po4fu NHFN8HrY2QozCEiA/FiUkL6YzcNM7CfatCldgkDvjz+0quAIv23aNUqksRyJ6mFmlJTSmg d439B/cIOeo6serXTqmIEJLQ7Ch1O3fDVgOKuvu8Ve8LnQtjh50S5jYXPV+lbi+HlH4V3g YN9ID04GTmEP5ashcL8ZrEOiO44YogQKhBS8zpGdYslo9q/0nsZyCbO1dNaoPmvgNif5f7 moS2NcibLqn7F4gDPvvPd4qDD6w5fHfP5qKggbEFa5xi3yFO4z5nEIctF/jhBA== 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=1785203434; 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=UVpr0+i6+7BU1haK1HUNnt3NKp1AZtmxIiniRrrZcE4=; b=SYuubRFHyKX8p6FGyhXvrJLb6v+YhbjEeCk5Q3lc8zz/wjgK6mda1Nn7GWJmgr5ftFt4/7 mRRjYoJ3bja3p/Q9m4m5OUfh9o5DZi1nyfG6YZVkTwyAFf9CzyFYklW7JXXDOVrjBUiunU elpsxOeAFuv2zTJjvpifqZ9JHFGRuYVjskbTR6EyM45g+sMMLMR0WfpV6EUGutVEpgB+86 zuYMY/PzzI4uU9+4zgkrcre9gk6HF4nnxaocfZ39gB/rGu0U83RZIiETudBgPMQCMDu6Lb JWJmWf/DTDH8hmeajGtZ4OqfDzcPxIDEne+vMIUw7JPs2Or2NhaAiXnUS9SkXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8JMG5fLMz31m for ; Tue, 28 Jul 2026 01:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41a77 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 01:50:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 8d92f32ae011 - main - make-pkg-package.sh: Fix build for pkg 2.8.0 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d92f32ae011719b322b9943d01529cebef741f0 Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 01:50:29 +0000 Message-Id: <6a680ae5.41a77.553597c5@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8d92f32ae011719b322b9943d01529cebef741f0 commit 8d92f32ae011719b322b9943d01529cebef741f0 Author: Colin Percival AuthorDate: 2026-07-28 01:43:30 +0000 Commit: Colin Percival CommitDate: 2026-07-28 01:49:28 +0000 make-pkg-package.sh: Fix build for pkg 2.8.0 We used to pass CONFIGURE_ARGS to the make command which builds pkg, but ports/ports-mgmt/pkg/Makefile has its own CONFIGURE_ARGS and the version we were providing at the command line didn't contain the --mandir setting which was added to the port with pkg 2.8.0. This broke release builds. Instead of passing --prefix=${LOCALBASE} via CONFIGURE_ARGS, pass PREFIX=${LOCALBASE}; the port Makefile passes that value through to its configure script. We also used to pass a --host parameter, but that seems to have become unnecessary at some point in the past decade. MFC after: 1 day Sponsored by: Amazon --- release/scripts/make-pkg-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/make-pkg-package.sh b/release/scripts/make-pkg-package.sh index 97ff5da93aac..fb296b07cc4a 100755 --- a/release/scripts/make-pkg-package.sh +++ b/release/scripts/make-pkg-package.sh @@ -22,7 +22,7 @@ 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) make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - CONFIGURE_ARGS="--host=$(uname -m)-portbld-freebsd${REVISION} --prefix=${LOCALBASE}" \ + PREFIX=${LOCALBASE} \ I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES \ BATCH=YES stage create-manifest