From f259daa708f507d3ff450d2eb8c05065674339ec Mon Sep 17 00:00:00 2001 From: Lexi Winter Date: Tue, 23 Sep 2025 23:15:35 +0100 Subject: Makefile.inc1: Fix package-pkg with a non-default LOCALBASE package-pkg (via make-pkg-package.sh) passes CONFIGURE_ARGS to make when building ports-mgmt/pkg, which overrides the port's default configure args that are supposed to set --prefix. This means that pkg is always built with the default prefix of /usr/local, which then fails when ports tries to package it from LOCALBASE. Work around this by explicitly adding --prefix to CONFIGURE_ARGS. MFC after: 1 day Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D52634 --- release/scripts/make-pkg-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release/scripts') diff --git a/release/scripts/make-pkg-package.sh b/release/scripts/make-pkg-package.sh index ee75e7d68d14..a1e006bd6964 100755 --- a/release/scripts/make-pkg-package.sh +++ b/release/scripts/make-pkg-package.sh @@ -13,7 +13,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}" \ + CONFIGURE_ARGS="--host=$(uname -m)-portbld-freebsd${REVISION} --prefix=${LOCALBASE}" \ I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES \ BATCH=YES stage create-manifest -- cgit v1.3