Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Feb 2020 04:29:56 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r525257 - in head/lang: rust rust-nightly rust-nightly/files
Message-ID:  <202002050429.0154Tu4F079437@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Wed Feb  5 04:29:55 2020
New Revision: 525257
URL: https://svnweb.freebsd.org/changeset/ports/525257

Log:
  lang/rust-nightly: Update to 1.43.0.20200205
  
  Remove some cruft while here.
  
  Changes:	https://github.com/rust-lang/rust/compare/41f41b2354...c9290dceee

Deleted:
  head/lang/rust-nightly/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py
Modified:
  head/lang/rust-nightly/Makefile
  head/lang/rust-nightly/distinfo
  head/lang/rust/Makefile

Modified: head/lang/rust-nightly/Makefile
==============================================================================
--- head/lang/rust-nightly/Makefile	Wed Feb  5 03:28:55 2020	(r525256)
+++ head/lang/rust-nightly/Makefile	Wed Feb  5 04:29:55 2020	(r525257)
@@ -1,35 +1,29 @@
 # Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
 # $FreeBSD$
 
-PORTVERSION=	1.42.0.${NIGHTLY_DATE:C,-,,g}
+PORTVERSION=	1.43.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 i386
+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
 
-CONFLICTS_INSTALL=	rust
+# Get latest from top level 'date' key in
+# https://static.rust-lang.org/dist/channel-rust-nightly.toml
+NIGHTLY_DATE=	2020-02-05
 
-# Which source to pull:
-#   https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz
-#   https://static.rust-lang.org/dist/channel-rust-nightly.toml
-NIGHTLY_DATE=			2020-01-24
-NIGHTLY_SUBDIR=			${NIGHTLY_DATE}/
-
 # See WRKSRC/src/stage0.txt for this date
-# XXX: Keep on nightly after 2020-01-24 for 13.0 i386 until beta has
-# https://github.com/rust-lang/rust/commit/de388032555b697d1b0ef197241886ab90ac39b2
-BOOTSTRAPS_DATE=		${NIGHTLY_DATE}
-RUST_BOOTSTRAP_VERSION=		nightly
-CARGO_BOOTSTRAP_VERSION=	nightly
-
-CARGO_VENDOR_DIR=	${WRKSRC}/vendor
-
-# Other bootstraps aren't provided by upstream yet
-ONLY_FOR_ARCHS=			amd64 i386
+BOOTSTRAPS_DATE=		2020-01-30
+RUST_BOOTSTRAP_VERSION=		beta
+CARGO_BOOTSTRAP_VERSION=	beta
 
 post-configure:
 # Don't abort if optional tools fail to build

Modified: head/lang/rust-nightly/distinfo
==============================================================================
--- head/lang/rust-nightly/distinfo	Wed Feb  5 03:28:55 2020	(r525256)
+++ head/lang/rust-nightly/distinfo	Wed Feb  5 04:29:55 2020	(r525257)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1579899008
-SHA256 (rust/2020-01-24/rustc-nightly-src.tar.xz) = 2a0fc007efb64068693b0141fe9e3e2c19a1a00a60844582278b47b1450240ac
-SIZE (rust/2020-01-24/rustc-nightly-src.tar.xz) = 94056884
-SHA256 (rust/2020-01-24/rustc-nightly-x86_64-unknown-freebsd.tar.xz) = 38f125afc6fad8902eeb02ea2971e0632141f3f6e30cce8f07617e824b033887
-SIZE (rust/2020-01-24/rustc-nightly-x86_64-unknown-freebsd.tar.xz) = 34418996
-SHA256 (rust/2020-01-24/rust-std-nightly-x86_64-unknown-freebsd.tar.xz) = abef7d8694f64ed8cbbcc259475cadedd48176286a5797dd742d1401e0f9a1d8
-SIZE (rust/2020-01-24/rust-std-nightly-x86_64-unknown-freebsd.tar.xz) = 16548420
-SHA256 (rust/2020-01-24/cargo-nightly-x86_64-unknown-freebsd.tar.xz) = 574bd22871f5e560921345ca21ce09ce0375fcca14f6802336f661061009b056
-SIZE (rust/2020-01-24/cargo-nightly-x86_64-unknown-freebsd.tar.xz) = 5020868
-SHA256 (rust/2020-01-24/rustc-nightly-i686-unknown-freebsd.tar.xz) = 15ff2eeaad362c083b722c6211977ec5d63750b384a0585b4a699cce20690246
-SIZE (rust/2020-01-24/rustc-nightly-i686-unknown-freebsd.tar.xz) = 35622756
-SHA256 (rust/2020-01-24/rust-std-nightly-i686-unknown-freebsd.tar.xz) = de74af8d86f95f3905b1cc4655e492bc49c22b2fedfabf277cb094597f1f6b04
-SIZE (rust/2020-01-24/rust-std-nightly-i686-unknown-freebsd.tar.xz) = 16483576
-SHA256 (rust/2020-01-24/cargo-nightly-i686-unknown-freebsd.tar.xz) = ebab904aae34ad1207a72089489844ced6a62574fb27caffcaf87ef120e1fa45
-SIZE (rust/2020-01-24/cargo-nightly-i686-unknown-freebsd.tar.xz) = 4918932
+TIMESTAMP = 1580876770
+SHA256 (rust/2020-02-05/rustc-nightly-src.tar.xz) = 7b41d4d2359c75a01a1851ae635b084d841bbbc2cea6bc722d17b6ea57537254
+SIZE (rust/2020-02-05/rustc-nightly-src.tar.xz) = 94238684
+SHA256 (rust/2020-01-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = de239e7838f913c1b4c03ec866b32966e83941a4797809f2baab2b07bb0b7225
+SIZE (rust/2020-01-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 34914832
+SHA256 (rust/2020-01-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = f8ff7d3298374817cbe40c20ae131f9ed95a4271f952596b6581da52d655618f
+SIZE (rust/2020-01-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 16447192
+SHA256 (rust/2020-01-30/cargo-beta-x86_64-unknown-freebsd.tar.xz) = ce5aa910f740219741342a092139a3b7278a7970c88b6f10966a3528a3bfc483
+SIZE (rust/2020-01-30/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5018440
+SHA256 (rust/2020-01-30/rustc-beta-i686-unknown-freebsd.tar.xz) = c3fdeb888e5bf7f98b82196f22553d97f93b4d486feae049c7b831049e3595b2
+SIZE (rust/2020-01-30/rustc-beta-i686-unknown-freebsd.tar.xz) = 35156088
+SHA256 (rust/2020-01-30/rust-std-beta-i686-unknown-freebsd.tar.xz) = 349f6534c6af0cb261523deaf497bb66158212d3a7bad2b7c748a4ed6abd269c
+SIZE (rust/2020-01-30/rust-std-beta-i686-unknown-freebsd.tar.xz) = 16429800
+SHA256 (rust/2020-01-30/cargo-beta-i686-unknown-freebsd.tar.xz) = 009bc310c8702a56c7b39f2f401a0ce80b833c0371e67eb2f378ba5ab9257181
+SIZE (rust/2020-01-30/cargo-beta-i686-unknown-freebsd.tar.xz) = 4918876

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Wed Feb  5 03:28:55 2020	(r525256)
+++ head/lang/rust/Makefile	Wed Feb  5 04:29:55 2020	(r525257)
@@ -9,7 +9,7 @@ MASTER_SITES=	https://static.rust-lang.org/dist/:src \
 		LOCAL/tobik/rust:bootstrap \
 		https://static.rust-lang.org/dist/:bootstrap
 DISTNAME?=	${PORTNAME}c-${PORTVERSION}-src
-DISTFILES?=	${NIGHTLY_SUBDIR}${DISTNAME}${EXTRACT_SUFX}:src \
+DISTFILES?=	${NIGHTLY_DATE:D${NIGHTLY_DATE}/}${DISTNAME}${EXTRACT_SUFX}:src \
 		${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \
 		${_RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \
 		${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap
@@ -26,7 +26,7 @@ LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 IGNORE_FreeBSD_11_powerpc64=	is missing a bootstrap for FreeBSD 11.x powerpc64
 ONLY_FOR_ARCHS?=	aarch64 amd64 armv6 armv7 i386 powerpc64
-ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
+ONLY_FOR_ARCHS_REASON?=	requires prebuilt bootstrap compiler
 
 BUILD_DEPENDS=	cmake:devel/cmake
 LIB_DEPENDS=	libcurl.so:ftp/curl \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002050429.0154Tu4F079437>