git: 80ab50e1de19 - main - pass UNAME_r to fix building 14.x ports on 13.x

Glen Barber gjb at FreeBSD.org
Thu Feb 18 23:53:27 UTC 2021


The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=80ab50e1de19ca125f05a13937c796d48c4edd4a

commit 80ab50e1de19ca125f05a13937c796d48c4edd4a
Author:     Glen Barber <gjb at FreeBSD.org>
AuthorDate: 2021-02-18 23:52:39 +0000
Commit:     Glen Barber <gjb at FreeBSD.org>
CommitDate: 2021-02-18 23:53:20 +0000

    pass UNAME_r to fix building 14.x ports on 13.x
    
    MFC after:      1 week
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 release/Makefile.vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/Makefile.vm b/release/Makefile.vm
index d201e11e19b2..b0bd47521dc5 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


More information about the dev-commits-src-all mailing list