From nobody Thu Aug 25 21:35:25 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MDGTn5d0Qz4ZZPc; Thu, 25 Aug 2022 21:35:25 +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 4MDGTn5C7gz3r4m; Thu, 25 Aug 2022 21:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661463325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g01bCanLpUvpYEnh8c4eORMJHLPRbKQoqtzfiaX1s/4=; b=k+vOnGMh1kGoUUzEL9OEgfMkJnRfDsupUYG+Zuy8WCr7RbEhmaEdK7lpPTBynA3Jb6PmP/ MI1ouZE/z/7aXYd0n5+w+Sj3Aol3k3Q449Vh5US1KwdaYUpSa7+1h0NJdRxNe0N9Sv5jp7 57MRZw66bTyZ0fEzlm82V9FvrHYoe5tg6bTCNtb1NBjT41QwvfQlanvgpFssq6FIsul4aB 7uT7U+RTx+2eEH8yq2EaiWi1/ovvW196B1yoN+0cQGLSZXhs3+8usAL9F5nJBB2TFX7+i0 NRJwxS9yIRHJw513kkpRvewvFuoY4jgFAuUe3oUSRfELy1KjsGGjE3ADd/tlOQ== 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 4MDGTn4Jn4z135X; Thu, 25 Aug 2022 21:35:25 +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 27PLZPU7085434; Thu, 25 Aug 2022 21:35:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PLZPVD085433; Thu, 25 Aug 2022 21:35:25 GMT (envelope-from git) Date: Thu, 25 Aug 2022 21:35:25 GMT Message-Id: <202208252135.27PLZPVD085433@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: 4b500674d509 - main - Uses/cargo: Allow using any Rust version if requested List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 4b500674d50988b7ce3585914be27ef74fea3c1d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661463325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g01bCanLpUvpYEnh8c4eORMJHLPRbKQoqtzfiaX1s/4=; b=WdlouIXM8CvDuQyVpRxGHFBqQQr23gNtPAFJvzVI3Ab5SD2+AYEFDDROhMnsCNl4ntQvUp HJFuMTiIBYcVxbiG5g1uhScNLgU4C78rk2E/VsAA2Fg8astQSoEfV4Pf2NvlFIPj+TWfMP 0nIgOIxUcAxRDfdTt3LxjbkbsPjRg/LA6nk9v00B/boINFsnD/bBsxnBpXki48gpjMOf96 P4tFNKCBU6ahyUZ75LsTw52QgcVvruP3v3CyxAW3+tkT1oQeNkZX1cktgzrLFbNz3G0leR zHOMvzPqCZqi4NPbCrekilXSdmV2vLIG5fNxYBCiUzhpe9K/NuwO1yqhRJ9r3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661463325; a=rsa-sha256; cv=none; b=VAdg1pBj2fzayqSXxbCIJ1oZvxUdtpKfWV6fADUnepOyjpceoxXrOPxR2PROL8ODjUoVBE rvEIE99pV8fHeBAzw/HqC/2WOp4JYhy3/9PKqO5vNhZ5EpF7gn5jwE2pzanOExYPcFWoMc IFpY6RlxQbTHeOalHaTExVxpC6+4dsmPeA0A7Zr17Jw6H1f8+bOhnghozvO2m2ZWv719rU dbe6AUBjel/Oqt+qwV7NEYt1LctEAw+3ho/U/HYylYoB9YaU9YQqlOFPuDrxt4QGUrSK95 U3+YBk7/tr5VLV1lPOZ9lilJOuXrkv0epBNNj6kOgpVK7yHrkjxO9wbbIa89aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b500674d50988b7ce3585914be27ef74fea3c1d commit 4b500674d50988b7ce3585914be27ef74fea3c1d Author: Tobias Kortkamp AuthorDate: 2022-08-25 21:16:22 +0000 Commit: Tobias Kortkamp CommitDate: 2022-08-25 21:16:22 +0000 Uses/cargo: Allow using any Rust version if requested Skip the Rust version check when CARGO_BUILDDEP=any-version The current version check is justified by USES=cargo making use of newer toolchain features that not all Cargo versions support and the fact that Rust binaries are statically linked against libstd (and others) which have been vulnerable in the past. We can enforce the use of the correct toolchain only with the version check. Together with revision bumps of all ports that have lang/rust as input we can ensure that they are kept "fresh" and relinked whenever lang/rust is updated. According to amdmi3@ skipping the check might be useful for build testing in some cases. Individual ports should not set CARGO_BUILDDEP=any-version. It can be set in make.conf or on the command line by users. PR: 265062 Reported by: amdmi3 --- Mk/Uses/cargo.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 55bedf30b1e9..5fa8e0e7e651 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -98,6 +98,8 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc} CARGO_BUILDDEP?= yes . if ${CARGO_BUILDDEP:tl} == "yes" BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.63.0:lang/${RUST_DEFAULT} +. elif ${CARGO_BUILDDEP:tl} == "any-version" +BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT} . endif # Location of toolchain (default to lang/rust's toolchain)