The branch main has been updated by gjb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=63749bfe96b792b3a435f84ad81a47888cae1dea
commit 63749bfe96b792b3a435f84ad81a47888cae1dea
Author: Glen Barber <g...@freebsd.org>
AuthorDate: 2021-03-04 14:22:45 +0000
Commit: Glen Barber <g...@freebsd.org>
CommitDate: 2021-03-04 14:25:18 +0000
release: sprinkle UNAME_r hacks following c883b6fd8ccd
Pass UNAME_r override to make(1) for ports builds when building
ports for another branch.
MFC after: 3 days
MFC with: 0be274d37379, 80ab50e1de19, c883b6fd8ccd
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
release/Makefile.azure | 2 +-
release/Makefile.ec2 | 2 +-
release/Makefile.gce | 2 +-
release/Makefile.vagrant | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/release/Makefile.azure b/release/Makefile.azure
index de95a944f9c7..32e91833b766 100644
--- a/release/Makefile.azure
+++ b/release/Makefile.azure
@@ -39,7 +39,7 @@ azure-check-depends:
. endif
env ASSUME_ALWAYS_YES=yes pkg install -y www/npm
. else
- make -C ${PORTSDIR}/www/npm BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm BATCH=1 all install
clean
. endif
. endif
npm install -g azure-cli
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 63552494db95..171de4ee2fa0 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -33,7 +33,7 @@ CW_EC2_PORTINSTALL=
cw-ec2-portinstall:
.if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile)
- env - PATH=$$PATH make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1
all install clean
+ env - UNAME_r=${UNAME_r} PATH=$$PATH make -C
${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean
.else
. if !exists(/usr/local/sbin/pkg-static)
env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
diff --git a/release/Makefile.gce b/release/Makefile.gce
index 106804de61e3..fac6918eab34 100644
--- a/release/Makefile.gce
+++ b/release/Makefile.gce
@@ -48,7 +48,7 @@ gce-check-depends:
. endif
env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk
. else
- make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1
all install clean
. endif
.endif
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant
index 4abcaa891ed3..d49eedacb6c9 100644
--- a/release/Makefile.vagrant
+++ b/release/Makefile.vagrant
@@ -58,7 +58,7 @@ vagrant-check-depends:
. endif
env ASSUME_ALWAYS_YES=yes pkg install -y curl
. else
- make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/ftp/curl BATCH=1 all install
clean
. endif
.endif
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
