Index: head/lang/rust-nightly/Makefile =================================================================== --- head/lang/rust-nightly/Makefile (revision 569012) +++ head/lang/rust-nightly/Makefile (revision 569013) @@ -1,28 +1,24 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ -PORTVERSION= 1.50.0.${NIGHTLY_DATE:C,-,,g} +# Run update.sh to update to the latest nightly +PORTVERSION= 1.53.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= upstream does not provide bootstraps for other architectures CONFLICTS_INSTALL= rust MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -# Get latest from top level 'date' key in -# https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2021-03-05 - -# See WRKSRC/src/stage0.txt for this date -BOOTSTRAPS_DATE= 2021-02-14 -RUST_BOOTSTRAP_VERSION= beta -CARGO_BOOTSTRAP_VERSION= beta +NIGHTLY_DATE= 2021-03-23 +BOOTSTRAPS_DATE= 2021-02-14 +RUST_BOOTSTRAP_VERSION= beta .include "${MASTERDIR}/Makefile" Index: head/lang/rust-nightly/distinfo =================================================================== --- head/lang/rust-nightly/distinfo (revision 569012) +++ head/lang/rust-nightly/distinfo (revision 569013) @@ -1,9 +1,9 @@ -TIMESTAMP = 1614940829 -SHA256 (rust/2021-03-05/rustc-nightly-src.tar.xz) = 53a31c16c0b119fddcace0aa7d57e107a8e21b40d4d04b976ddcb363f0273fce -SIZE (rust/2021-03-05/rustc-nightly-src.tar.xz) = 114645532 +TIMESTAMP = 1616475173 +SHA256 (rust/2021-03-23/rustc-nightly-src.tar.xz) = ad47a8bef68e6d130e0477e16c0cab89e4f2e447f16578fc7243bac095a5ea56 +SIZE (rust/2021-03-23/rustc-nightly-src.tar.xz) = 115047736 SHA256 (rust/2021-02-14/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 1eb1f1508887449de36aa0dc75e549b8185d7d0bd4f86d503adda09295397fb7 SIZE (rust/2021-02-14/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 79211584 SHA256 (rust/2021-02-14/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = f366210bf594eda2b3a6547aff7fb0f32cde99e1a0ec427d2a05a430cc9795b2 SIZE (rust/2021-02-14/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 25348664 SHA256 (rust/2021-02-14/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 1cd82e9ea763ad75b094043b0604c606222015f981fbf0d8c05c541d2b145939 SIZE (rust/2021-02-14/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6252112 Index: head/lang/rust-nightly/files/patch-backtrace =================================================================== --- head/lang/rust-nightly/files/patch-backtrace (nonexistent) +++ head/lang/rust-nightly/files/patch-backtrace (revision 569013) @@ -0,0 +1,12 @@ +https://github.com/rust-lang/rust/issues/78184 + +--- library/backtrace/src/symbolize/gimli.rs.orig 2021-02-10 17:36:59 UTC ++++ library/backtrace/src/symbolize/gimli.rs +@@ -361,6 +361,7 @@ cfg_if::cfg_if! { + } else if #[cfg(any( + target_os = "linux", + target_os = "fuchsia", ++ target_os = "freebsd", + ))] { + // Other Unix (e.g. Linux) platforms use ELF as an object file format + // and typically implement an API called `dl_iterate_phdr` to load Property changes on: head/lang/rust-nightly/files/patch-backtrace ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/lang/rust-nightly/files/patch-src_bootstrap_install.rs =================================================================== --- head/lang/rust-nightly/files/patch-src_bootstrap_install.rs (nonexistent) +++ head/lang/rust-nightly/files/patch-src_bootstrap_install.rs (revision 569013) @@ -0,0 +1,17 @@ +Only install docs for the host target + +It otherwise wastes significant time (there are a lot of individual +files) and stages host docs, wasm docs, which unstages the host +docs first. + +--- src/bootstrap/install.rs.orig 2021-03-22 17:05:25 UTC ++++ src/bootstrap/install.rs +@@ -133,7 +133,7 @@ macro_rules! install { + } + + install!((self, builder, _config), +- Docs, "src/doc", _config.docs, only_hosts: false, { ++ Docs, "src/doc", _config.docs, only_hosts: true, { + let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs"); + install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball); + }; Property changes on: head/lang/rust-nightly/files/patch-src_bootstrap_install.rs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/rust-nightly/update.sh =================================================================== --- head/lang/rust-nightly/update.sh (nonexistent) +++ head/lang/rust-nightly/update.sh (revision 569013) @@ -0,0 +1,37 @@ +#!/bin/sh +# Requires: pkg install portfmt +# 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) +fetch -qo /tmp/channel-rust-nightly.toml https://static.rust-lang.org/dist/channel-rust-nightly.toml +rust-nightly.msg Property changes on: head/lang/rust-nightly/update.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property