From b807a7b276a8a0496c439e99690753d0dc123bc8 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Wed, 5 Feb 2020 04:29:55 +0000 Subject: [PATCH] lang/rust-nightly: Update to 1.43.0.20200205 Remove some cruft while here. Changes: https://github.com/rust-lang/rust/compare/41f41b2354...c9290dceee --- lang/rust-nightly/Makefile | 30 ++++++++----------- lang/rust-nightly/distinfo | 30 +++++++++---------- ...ct_llvm_utils_llvm-build_llvmbuild_main.py | 11 ------- lang/rust/Makefile | 4 +-- 4 files changed, 29 insertions(+), 46 deletions(-) delete mode 100644 lang/rust-nightly/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index bbfd076770e2..647c13a89f45 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -1,35 +1,29 @@ # Created by: Jean-Sébastien Pédron # $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 - -# 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}/ +# Get latest from top level 'date' key in +# https://static.rust-lang.org/dist/channel-rust-nightly.toml +NIGHTLY_DATE= 2020-02-05 # 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 diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index 02632a1e3016..0504c1b98a05 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -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 diff --git a/lang/rust-nightly/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py b/lang/rust-nightly/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py deleted file mode 100644 index 65e9ba65e50e..000000000000 --- a/lang/rust-nightly/files/patch-src_llvm-project_llvm_utils_llvm-build_llvmbuild_main.py +++ /dev/null @@ -1,11 +0,0 @@ ---- src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py.orig 2018-04-04 08:39:57 UTC -+++ src/llvm-project/llvm/utils/llvm-build/llvmbuild/main.py -@@ -752,6 +752,8 @@ def add_magic_target_components(parser, project, opts) - # We handle a few special cases of target names here for historical - # reasons, as these are the names configure currently comes up with. - native_target_name = { 'x86' : 'X86', -+ 'i386' : 'X86', -+ 'amd64' : 'X86', - 'x86_64' : 'X86', - 'Unknown' : None }.get(opts.native_target, - opts.native_target) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 0cf3d97c893c..c20017cafe21 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -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 \