Date: Thu, 29 Apr 2021 15:57:07 GMT From: Glen Barber <gjb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: aa4eb2089751 - stable/13 - pass UNAME_r to fix building 14.x ports on 13.x Message-ID: <202104291557.13TFv7Bd059248@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=aa4eb2089751cd0039d114a0fd016d2d7fddc5e9 commit aa4eb2089751cd0039d114a0fd016d2d7fddc5e9 Author: Glen Barber <gjb@FreeBSD.org> AuthorDate: 2021-02-18 23:52:39 +0000 Commit: Glen Barber <gjb@FreeBSD.org> CommitDate: 2021-04-29 15:55:46 +0000 pass UNAME_r to fix building 14.x ports on 13.x Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 80ab50e1de19ca125f05a13937c796d48c4edd4a) --- release/Makefile.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 39a8186ba675..67e849369596 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -54,7 +54,7 @@ emulator-portinstall: .if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) - env - PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean + env - UNAME_r="${REVISION}-${BRANCH}" PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean .else .if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104291557.13TFv7Bd059248>