Adjust where UNAME_r is defined for ports builds
In followup to80ab50e1de
, export UNAME_r in Makefile.inc1 instead of Makefile.vm. MFC after: 3 days MFC with:80ab50e1de
Sponsored by: Rubicon Communications, LLC ("Netgate")
This commit is contained in:
parent
ee21ee1572
commit
0be274d373
@ -40,3 +40,6 @@ BUILDDATE!= date +%Y%m%d
|
|||||||
.export BUILDDATE
|
.export BUILDDATE
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
# Override UNAME_r to allow building ports for a different branch.
|
||||||
|
UNAME_r= ${REVISION}-${BRANCH}
|
||||||
|
.export UNAME_r
|
||||||
|
@ -54,7 +54,7 @@ emulator-portinstall:
|
|||||||
.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" )
|
.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" )
|
||||||
.if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static)
|
.if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static)
|
||||||
.if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile)
|
.if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile)
|
||||||
env - UNAME_r="${REVISION}-${BRANCH}" PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean
|
env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean
|
||||||
.else
|
.else
|
||||||
.if !exists(/usr/local/sbin/pkg-static)
|
.if !exists(/usr/local/sbin/pkg-static)
|
||||||
env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
|
env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
|
||||||
|
Loading…
Reference in New Issue
Block a user