git: aa61f25f2a73 - main - lang/rust-bootstrap: Export MASTER_SITES via .MAKEFLAGS for makesum
Tobias Kortkamp
tobik at FreeBSD.org
Sun Jun 6 08:12:36 UTC 2021
The branch main has been updated by tobik:
URL: https://cgit.FreeBSD.org/ports/commit/?id=aa61f25f2a73ab7ed2bdc455c3d19f2f73222cd8
commit aa61f25f2a73ab7ed2bdc455c3d19f2f73222cd8
Author: Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-06-04 08:58:03 +0000
Commit: Tobias Kortkamp <tobik at FreeBSD.org>
CommitDate: 2021-06-06 08:09:01 +0000
lang/rust-bootstrap: Export MASTER_SITES via .MAKEFLAGS for makesum
Just replacing one hack with another. With this it is localized
on one line and we no longer need .export and MASTER_SITES with ?=
---
lang/rust-bootstrap/Makefile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile
index 476a53edb84c..15521fd1091e 100644
--- a/lang/rust-bootstrap/Makefile
+++ b/lang/rust-bootstrap/Makefile
@@ -5,7 +5,7 @@ PORTNAME= rust
PORTVERSION= 1.52.1
PORTREVISION= 1
CATEGORIES= lang
-MASTER_SITES?= https://static.rust-lang.org/dist/:rust \
+MASTER_SITES= https://static.rust-lang.org/dist/:rust \
LOCAL/tobik/rust:${FLAVOR} \
https://download.freebsd.org/ftp/${_RUST_FBSD_SUBDIR_${FLAVOR}}/:${FLAVOR}
# http://pkg.freebsd.org/FreeBSD:12:powerpc64/quarterly/All/gcc9-9.3.0_1.txz?dummy=/:powerpc64_gcc
@@ -128,8 +128,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/${FLAVOR:S/_/-/}
.endif
.if make(distclean) || make(makesum)
-MASTER_SITES:= ${FLAVORS:@_flavor@${:!${SETENV} FLAVOR=${_flavor} ${MAKE} -VMASTER_SITES!}@:O:u}
-.export MASTER_SITES
+.MAKEFLAGS: MASTER_SITES="${FLAVORS:@_flavor@${:!${SETENV} FLAVOR=${_flavor} ${MAKE} -VMASTER_SITES!}@:O:u:q}" # PR 249537
DISTFILES:= ${DISTFILES:M*\:rust} \
${FLAVORS:O:@_flavor@${:!${SETENV} FLAVOR=${_flavor} ${MAKE} -V'DISTFILES:N*\:rust'!}@}
.endif
More information about the dev-commits-ports-all
mailing list