Date: Sat, 22 Jul 2023 03:24:30 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: 1feb6f1cbe06 - stable/13 - release: sprinkle UNAME_r hacks following c883b6fd8ccd Message-ID: <202307220324.36M3OUdk085843@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=1feb6f1cbe06c0b6dbbb96b4d195813e129c634b commit 1feb6f1cbe06c0b6dbbb96b4d195813e129c634b Author: Glen Barber <gjb@FreeBSD.org> AuthorDate: 2021-03-04 14:22:45 +0000 Commit: Glen Barber <gjb@FreeBSD.org> CommitDate: 2023-07-22 03:18:43 +0000 release: sprinkle UNAME_r hacks following c883b6fd8ccd Pass UNAME_r override to make(1) for ports builds when building ports for another branch. Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd (cherry picked from commit 63749bfe96b792b3a435f84ad81a47888cae1dea) --- release/Makefile.azure | 2 +- release/Makefile.ec2 | 2 +- release/Makefile.vagrant | 2 +- 3 files changed, 3 insertions(+), 3 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 035137e61d53..e26f4f705cc6 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -45,7 +45,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.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307220324.36M3OUdk085843>