From nobody Tue Nov 08 09:15:59 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 4N62Wz5GZLz4h8mx; Tue, 8 Nov 2022 09:15:59 +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 4N62Wz3t7tz4MnR; Tue, 8 Nov 2022 09:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667898959; 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=1pGxsL4uuekj3Zzvf8p/tTQl3BclAgYpmAgcKGyti5k=; b=GuG4uhmW1+s9Ata3XCwQhb3DU4KfW11iXo73wSl2irxvLrytwEVIlHH/QETwhTphtZ5Hof Z7tWcsXRBNLTRAY3JOaxsReD00I8RkigruV+Xsy0QfxtMsLaKtpI7nhNCIHqKiP0bJ+x9N FoIdTICBNRf9iT1Epu+5TvuzNUKTnq0vkMuywxt4AhKzi5YWaqeoE0T8B/4ezoJMWs6Sy5 TroApXITmZ5GjhhWvVj8qgNw1y97PHofgaWqCdlSi8Ef+8NMRp264dcatMf6kgKTCPZJYz MG1VSfYJgR+NsQdNZn7ZOmwAlmX4DoWb4ou+Onnwqu4q16BHzpZz0tTBmJl3Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667898959; 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=1pGxsL4uuekj3Zzvf8p/tTQl3BclAgYpmAgcKGyti5k=; b=NtyESMQMl3z7bcMnc5L5RsmRUzMez44lmihOE/l7Kx3suxm4bOjldKjgUIMFC/i4HnkG5B 3ayZt12CU5eXtFMDJ/81CTdFnuKin8YCW22ZRO8lvFSfuxYJYKKbURmX9pasJL3ja7tgSJ asykWKVNarJ7/MdfBnbGeNt+jpTU/cwjGIPg6d8eZkUPQVT7m38FvfhUs8EVLiXavFENE+ NQSY2UJpe97BejDY2QuxulFMg1oFdtb6sahrQOXuq/jSJtoQS+go01wrMUreEnsqb9pK40 /ZQyUWJyD29LqsYb372udU5M/mI8cBWkZ7YYmtfV6poJc4aCitUL3roQMZN+SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667898959; a=rsa-sha256; cv=none; b=E/cydnloCS/mavbxCQVuVTjTLE8HIQPU3tJ0IXg2T8GUi7HY+O9+MlVp0EA5m1rLT9M1/1 yuBYystcbBBi9V9SHk+wutxSjBlRyaIY2jdi8PgKHy1Dqy5jKpKdfDQWP1d/6f2kfeVTyo Af7qQO+eNO+TM10p6Do00gJCyx+8v/Wrsxzu6AopW/8BZXglwOJLMD9AqZWQybUB1XN4LJ lpOcT4CieKzmQTy3cTYoCh7Xj9nlN1hLzx0N4nRk2rp2fhmyheDbCOlqUKfbOhq74xZn6J TFg25rJs0IyDqoAAxfznGAb8lLcG0PZqIf3ukLh+APu9bO6Qc7YjYn7PiomWTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N62Wz2ptxzcp4; Tue, 8 Nov 2022 09:15:59 +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 2A89FxH2061172; Tue, 8 Nov 2022 09:15:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A89Fxt0061171; Tue, 8 Nov 2022 09:15:59 GMT (envelope-from git) Date: Tue, 8 Nov 2022 09:15:59 GMT Message-Id: <202211080915.2A89Fxt0061171@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: 922686e80097 - main - USES=cargo: Fix CARGO_BUILDDEP=any-version 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: 922686e80097c77e700c1788dd78fbd3bd8777a0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=922686e80097c77e700c1788dd78fbd3bd8777a0 commit 922686e80097c77e700c1788dd78fbd3bd8777a0 Author: Tobias Kortkamp AuthorDate: 2022-11-08 09:12:59 +0000 Commit: Tobias Kortkamp CommitDate: 2022-11-08 09:12:59 +0000 USES=cargo: Fix CARGO_BUILDDEP=any-version Fix update.sh to only replace the first version. --- Mk/Uses/cargo.mk | 2 +- lang/rust/update.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 91172824264d..cbf91d27c70a 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -99,7 +99,7 @@ CARGO_BUILDDEP?= yes . if ${CARGO_BUILDDEP:tl} == "yes" BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.64.0:lang/${RUST_DEFAULT} . elif ${CARGO_BUILDDEP:tl} == "any-version" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.64.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT} . endif # Location of toolchain (default to lang/rust's toolchain) diff --git a/lang/rust/update.sh b/lang/rust/update.sh index 64ac7180b0b7..80b8da99b5c3 100644 --- a/lang/rust/update.sh +++ b/lang/rust/update.sh @@ -13,8 +13,11 @@ fetch -qo - https://raw.githubusercontent.com/rust-lang/rust/${new_commit}/src/s "RUST_BOOTSTRAP_VERSION=\(.compiler.version)" ' | portedit merge -i . -sed -i '' -E -e "s,(\\$\\{RUST_DEFAULT\\}>=).*(:lang/\\$\\{RUST_DEFAULT\\}),\\1${version}\\2," \ - ../../Mk/Uses/cargo.mk ../../Mk/bsd.gecko.mk +cat <=/ { + s,(\\$\\{RUST_DEFAULT\\}>=).*(:lang/\\$\\{RUST_DEFAULT\\}),\\1${version}\\2, +} +EOF portedit set-version -i "${version}" . portedit set-version -i "${version}" ../rust-bootstrap