Date: Wed, 6 Oct 2021 12:05:39 GMT From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 15d61162f702 - main - lang/rust-nightly: Update to 1.57.0.20211005 Message-ID: <202110061205.196C5d0P026903@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=15d61162f70282cc075f10e81cbd54eedbd3369a commit 15d61162f70282cc075f10e81cbd54eedbd3369a Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2021-10-06 10:50:15 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2021-10-06 12:01:52 +0000 lang/rust-nightly: Update to 1.57.0.20211005 Changes: https://github.com/rust-lang/rust/compare/f586d79d183d144e0cbf519e29247f36670e2076...25ec8273855fde2d72ae877b397e054de5300e10 --- lang/rust-nightly/Makefile | 6 +++--- lang/rust-nightly/distinfo | 18 +++++++++--------- lang/rust-nightly/update.sh | 36 ++++++++++++------------------------ lang/rust/Makefile | 2 +- 4 files changed, 25 insertions(+), 37 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index 6d522694fde7..3381b9b30b4a 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -1,7 +1,7 @@ # Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org> # Run update.sh to update to the latest nightly -PORTVERSION= 1.55.0.${NIGHTLY_DATE:C,-,,g} +PORTVERSION= 1.57.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly @@ -16,8 +16,8 @@ MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -NIGHTLY_DATE= 2021-06-14 -BOOTSTRAPS_DATE= 2021-05-23 +NIGHTLY_DATE= 2021-10-05 +BOOTSTRAPS_DATE= 2021-09-08 RUST_BOOTSTRAP_VERSION= beta .include "${MASTERDIR}/Makefile" diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index caf77f07ad32..821949d4957f 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1623695284 -SHA256 (rust/2021-06-14/rustc-nightly-src.tar.xz) = c750251b898921c3c52a4795e3904085dca7408fcac011514e51456b56cb9a6a -SIZE (rust/2021-06-14/rustc-nightly-src.tar.xz) = 116203420 -SHA256 (rust/2021-05-23/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 310aecc7b2614640c52abbc1f8604e01bb7b2b5bbcdf7f00240739922351282a -SIZE (rust/2021-05-23/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 81197824 -SHA256 (rust/2021-05-23/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = f3682845f5be72f00a669670de5c683174825c815316aa96e4c975bf01682deb -SIZE (rust/2021-05-23/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 26311128 -SHA256 (rust/2021-05-23/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 797e510526d84bb3ddb685148dd9bc4f590f22223bb64737ecad552874c31b86 -SIZE (rust/2021-05-23/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6261656 +TIMESTAMP = 1633514113 +SHA256 (rust/2021-10-05/rustc-nightly-src.tar.xz) = de6745a76edeaf447a9cfa9cc296b7a69550225323199741b44948a680c36197 +SIZE (rust/2021-10-05/rustc-nightly-src.tar.xz) = 122279192 +SHA256 (rust/2021-09-08/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 4e01128800f479a96597ce7eee9d2e76a5128ae1c13a4e0e2eb52e36d43cf559 +SIZE (rust/2021-09-08/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 120261460 +SHA256 (rust/2021-09-08/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 5faf349a9cc231c144c52de40f2a487a935c6f6146614547e64cabb26f037a23 +SIZE (rust/2021-09-08/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 24109712 +SHA256 (rust/2021-09-08/cargo-beta-x86_64-unknown-freebsd.tar.xz) = b65f8024b47d4784ab59e4722e522e54442852bbe16906760f2708e2b0d0fe65 +SIZE (rust/2021-09-08/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6506908 diff --git a/lang/rust-nightly/update.sh b/lang/rust-nightly/update.sh index 7e707fe09c1c..6976d9424982 100644 --- a/lang/rust-nightly/update.sh +++ b/lang/rust-nightly/update.sh @@ -1,35 +1,23 @@ #!/bin/sh -# Requires: pkg install portfmt +# Requires: pkg install portfmt yq # Run in lang/rust-nightly set -eu -get_commit() { - awk ' -$1 == "[pkg.rustc]" { pkg_rustc = 1 } -pkg_rustc && $1 == "git_commit_hash" { - print substr($3, 2, 10) - exit -}' -} - prev_date=$(portedit get '^NIGHTLY_DATE$' .) -prev_commit=$(fetch -qo - https://static.rust-lang.org/dist/${prev_date}/channel-rust-nightly.toml | get_commit) +prev_commit=$(fetch -qo - https://static.rust-lang.org/dist/${prev_date}/channel-rust-nightly.toml | tomlq -r '.pkg.rustc.git_commit_hash') fetch -qo /tmp/channel-rust-nightly.toml https://static.rust-lang.org/dist/channel-rust-nightly.toml -</tmp/channel-rust-nightly.toml awk ' -$1 == "[pkg.rustc]" { pkg_rustc = 1 } -date == "" && $1 == "date" { date = substr($3, 2, length($3) - 2) } -date && pkg_rustc && $1 == "version" { - version = substr($3, 2, length($3) - length("-nightly") - 1) - printf("PORTVERSION=%s.${NIGHTLY_DATE:C,-,,g}\nPORTREVISION=0\nNIGHTLY_DATE=%s\n", version, date) - exit -}' | portedit merge -i . -new_commit=$(</tmp/channel-rust-nightly.toml get_commit) +</tmp/channel-rust-nightly.toml tomlq -r ' + "PORTVERSION=\(.pkg.rustc.version | split("-nightly")[0]).${NIGHTLY_DATE:C,-,,g}", + "PORTREVISION=0", + "NIGHTLY_DATE=\(.pkg.rustc.version | split(" ")[2][:-1])" +' | portedit merge -i . +new_commit=$(</tmp/channel-rust-nightly.toml tomlq -r '.pkg.rustc.git_commit_hash') rm /tmp/channel-rust-nightly.toml -fetch -qo - https://raw.githubusercontent.com/rust-lang/rust/${new_commit}/src/stage0.txt | awk ' -$1 == "date:" { date = $2 } -$1 == "rustc:" { rustc = $2 } -END { printf("BOOTSTRAPS_DATE=%s\nRUST_BOOTSTRAP_VERSION=%s\n", date, rustc) }' | portedit merge -i . +fetch -qo - https://raw.githubusercontent.com/rust-lang/rust/${new_commit}/src/stage0.json | jq -r ' + "BOOTSTRAPS_DATE=\(.compiler.date)", + "RUST_BOOTSTRAP_VERSION=\(.compiler.version)" +' | portedit merge -i . make makesum echo "lang/rust-nightly: Update to $(make -V PORTVERSION) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 2aa606e6d3c9..5d048759c9f7 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -122,7 +122,7 @@ DISTFILES:= ${DISTFILES:M*\:src} \ post-patch: @${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb .if defined(NIGHTLY_DATE) - @${REINPLACE_CMD} '/^rustfmt:/d' ${WRKSRC}/src/stage0.txt + @${REINPLACE_CMD} 's/"rustfmt"/"nothx"/' ${WRKSRC}/src/stage0.json .endif # Disable vendor checksums @${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110061205.196C5d0P026903>