git: e7381649048f - stable/15 - make-pkg-package.sh: Fix build for pkg 2.8.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 29 Jul 2026 00:33:40 UTC
The branch stable/15 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=e7381649048feb2e30f2aef2dac0e4924e7d815a
commit e7381649048feb2e30f2aef2dac0e4924e7d815a
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-07-28 01:43:30 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-07-29 00:33:09 +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
(cherry picked from commit 8d92f32ae011719b322b9943d01529cebef741f0)
---
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 3a1b163bd591..d8559dca1372 100755
--- a/release/scripts/make-pkg-package.sh
+++ b/release/scripts/make-pkg-package.sh
@@ -20,7 +20,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