From owner-dev-commits-ports-all@freebsd.org Sun Jun 6 08:12:36 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 721006592DD; Sun, 6 Jun 2021 08:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FyTkr2QRMz3r39; Sun, 6 Jun 2021 08:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3BD062050D; Sun, 6 Jun 2021 08:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1568Caix054559; Sun, 6 Jun 2021 08:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1568CaeU054558; Sun, 6 Jun 2021 08:12:36 GMT (envelope-from git) Date: Sun, 6 Jun 2021 08:12:36 GMT Message-Id: <202106060812.1568CaeU054558@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: aa61f25f2a73 - main - lang/rust-bootstrap: Export MASTER_SITES via .MAKEFLAGS for makesum MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa61f25f2a73ab7ed2bdc455c3d19f2f73222cd8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2021 08:12:36 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa61f25f2a73ab7ed2bdc455c3d19f2f73222cd8 commit aa61f25f2a73ab7ed2bdc455c3d19f2f73222cd8 Author: Tobias Kortkamp AuthorDate: 2021-06-04 08:58:03 +0000 Commit: Tobias Kortkamp 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