Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Jan 2018 08:07:58 +0000 (UTC)
From:      =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r459911 - head/lang/rust
Message-ID:  <201801250807.w0P87wLJ092162@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dumbbell
Date: Thu Jan 25 08:07:58 2018
New Revision: 459911
URL: https://svnweb.freebsd.org/changeset/ports/459911

Log:
  lang/rust: Update to 1.23.0
  
  Firefox 57.0 failed to build with Rust 1.23.0 with the following error:
  
      error: unused import: `std::ascii::AsciiExt`
        --> /wrkdirs/usr/ports/www/firefox/work/firefox-57.0.4/servo/components/style/gecko_string_cache/mod.rs:16:5
         |
      16 | use std::ascii::AsciiExt;
         |     ^^^^^^^^^^^^^^^^^^^^
         |
      note: lint level defined here
        --> /wrkdirs/usr/ports/www/firefox/work/firefox-57.0.4/servo/components/style/lib.rs:26:9
         |
      26 | #![deny(warnings)]
         |         ^^^^^^^^
         = note: #[deny(unused_imports)] implied by #[deny(warnings)]
  
  Now that Firefox is updated to 58.0, the build succeeds.

Modified:
  head/lang/rust/Makefile
  head/lang/rust/distinfo

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Thu Jan 25 07:52:54 2018	(r459910)
+++ head/lang/rust/Makefile	Thu Jan 25 08:07:58 2018	(r459911)
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.22.1
-PORTREVISION?=	2
+PORTVERSION?=	1.23.0
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		LOCAL/dumbbell/rust:rust_bootstrap \
-		https://static.rust-lang.org/dist/:rust_bootstrap \
+		https://dev-static.rust-lang.org/dist/:rust_bootstrap \
 		LOCAL/dumbbell/rust:cargo_bootstrap \
-		https://static.rust-lang.org/dist/:cargo_bootstrap \
+		https://dev-static.rust-lang.org/dist/:cargo_bootstrap \
 		https://s3.amazonaws.com/rust-lang-ci/cargo-builds/:cargo_bootstrap \
 		LOCAL/marino:bootstrap
 DISTNAME?=	${PORTNAME}c-${PORTVERSION}-src
@@ -43,14 +42,14 @@ ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap com
 #CONFLICTS_BUILD+=	${PKGBASE}
 CONFLICTS_INSTALL?=	rust-nightly
 
-BOOTSTRAPS_DATE?=		2017-10-12
+BOOTSTRAPS_DATE?=		2017-11-20
 
-RUST_BOOTSTRAP_VERSION?=	1.21.0
+RUST_BOOTSTRAP_VERSION?=	1.22.1
 RUSTC_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 RUST_STD_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 
-CARGO_BOOTSTRAP_VERSION?=	0.22.0
-CARGO_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}${EXTRACT_SUFX}
+CARGO_BOOTSTRAP_VERSION?=	0.23.0
+CARGO_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 
 RUST_CHANNEL=	${PKGNAMESUFFIX:Ustable:S/^-//}
 
@@ -62,7 +61,7 @@ RUST_ARCH_x86_64=	x86_64 # dragonfly
 RUST_TARGET=		${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl}
 PLIST_SUB+=		RUST_TARGET=${RUST_TARGET}
 
-USES=		compiler gmake libedit pkgconfig python:2.7,build ssl
+USES=		compiler gmake libedit pkgconfig python:2.7,build ssl tar:xz
 
 OPTIONS_DEFINE=		DOCS GDB LLNEXTGEN SOURCES
 GDB_DESC=		Install ports gdb (necessary for debugging rust programs)
@@ -145,7 +144,7 @@ post-extract:
 	(set -ex; cd ${WRKSRC}; \
 	 libstd="$$(echo "${RUST_STD_DIR}/rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET}/lib/"libstd-*.rlib)"; \
 	 hash="$$(basename "$$libstd" .rlib | ${SED} 's/^libstd-//')"; \
-	 std_o="std-$$hash.0.o"; \
+	 std_o="std-$$hash.std0.rust-cgu.o"; \
 	 ${AR} x "$$libstd" "$$std_o"; \
 	 ${LD} -r -o std.xx.o "$$std_o" old_fstat.o; \
 	 ${MV} std.xx.o "$$std_o"; \
@@ -342,7 +341,7 @@ do-test:
 
 BOOTSTRAPS_SOURCE_PKG_FBSDVER=		10
 BOOTSTRAPS_SOURCE_PKG_FBSDVER_aarch64=	11
-BOOTSTRAPS_SOURCE_PKG_REV=		_1
+BOOTSTRAPS_SOURCE_PKG_REV=		_2
 BOOTSTRAPS_SOURCE_PKG_URL=	http://pkg.freebsd.org/FreeBSD:${BOOTSTRAPS_SOURCE_PKG_FBSDVER_${ARCH}:U${BOOTSTRAPS_SOURCE_PKG_FBSDVER}}:${ARCH}/latest/All/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}${BOOTSTRAPS_SOURCE_PKG_REV}.txz
 BOOTSTRAPS_SOURCE_PKG=		${_DISTDIR}/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${ARCH}.txz
 
@@ -361,7 +360,7 @@ package-to-bootstraps: ${BOOTSTRAPS_SOURCE_PKG}
 		${MV} ${WRKDIR}/bootstraps/bin/rust* rustc/bin && \
 		${MV} ${WRKDIR}/bootstraps/lib/*.so rustc/lib
 	${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \
-		-f ${_DISTDIR}/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz \
+		-f ${_DISTDIR}/${RUSTC_BOOTSTRAP} \
 		rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
 # `rust-std` bootstrap.
 	${RM} -r ${WRKDIR}/bootstraps/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
@@ -370,7 +369,7 @@ package-to-bootstraps: ${BOOTSTRAPS_SOURCE_PKG}
 		${MKDIR} rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET} && \
 		${MV} ${WRKDIR}/bootstraps/lib/rustlib/${RUST_TARGET}/lib rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET}
 	${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \
-		-f ${_DISTDIR}/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz \
+		-f ${_DISTDIR}/${RUST_STD_BOOTSTRAP} \
 		rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
 
 ${BOOTSTRAPS_SOURCE_PKG}:

Modified: head/lang/rust/distinfo
==============================================================================
--- head/lang/rust/distinfo	Thu Jan 25 07:52:54 2018	(r459910)
+++ head/lang/rust/distinfo	Thu Jan 25 08:07:58 2018	(r459911)
@@ -1,21 +1,21 @@
-TIMESTAMP = 1511741686
-SHA256 (rust/rustc-1.22.1-src.tar.gz) = 8b7a42bdd6eb205a8c533eb41b5c42389a88158d060aed1e0f461f68c1fd3fd3
-SIZE (rust/rustc-1.22.1-src.tar.gz) = 54935620
-SHA256 (rust/2017-10-12/rustc-1.21.0-aarch64-unknown-freebsd.tar.gz) = 6302769f6ec103bcfe4c41134c1e76747371261288059195dc9ff8a44e67601f
-SIZE (rust/2017-10-12/rustc-1.21.0-aarch64-unknown-freebsd.tar.gz) = 44419411
-SHA256 (rust/2017-10-12/rust-std-1.21.0-aarch64-unknown-freebsd.tar.gz) = 92bc37314a1bc044ce25df95ffa4f5222a96017da968e0e4256de02efa83e2a4
-SIZE (rust/2017-10-12/rust-std-1.21.0-aarch64-unknown-freebsd.tar.gz) = 59227300
-SHA256 (rust/2017-10-12/cargo-0.22.0-aarch64-unknown-freebsd.tar.gz) = df4127117966f55146624c4c198394754bdbe17a3ca6575b3f64d45b87929506
-SIZE (rust/2017-10-12/cargo-0.22.0-aarch64-unknown-freebsd.tar.gz) = 3072402
-SHA256 (rust/2017-10-12/rustc-1.21.0-i686-unknown-freebsd.tar.gz) = 166f977785da34b06d683d9c1b7a3618dd608832e862e9f8ea31c3362026e365
-SIZE (rust/2017-10-12/rustc-1.21.0-i686-unknown-freebsd.tar.gz) = 44398731
-SHA256 (rust/2017-10-12/rust-std-1.21.0-i686-unknown-freebsd.tar.gz) = db47d7f9f6f36d23c7cdc0369f1ca10335f9460e71552043a8c8753bb30733e4
-SIZE (rust/2017-10-12/rust-std-1.21.0-i686-unknown-freebsd.tar.gz) = 59018318
-SHA256 (rust/2017-10-12/cargo-0.22.0-i686-unknown-freebsd.tar.gz) = b2a27147d3ca741cb740f73a7651b9d816d583d7d89be189cae3b7eecff9104e
-SIZE (rust/2017-10-12/cargo-0.22.0-i686-unknown-freebsd.tar.gz) = 5314447
-SHA256 (rust/2017-10-12/rustc-1.21.0-x86_64-unknown-freebsd.tar.gz) = 39324408009725e4e8c3c4baeece26063d461d1c946d448351ce60add591d328
-SIZE (rust/2017-10-12/rustc-1.21.0-x86_64-unknown-freebsd.tar.gz) = 43542981
-SHA256 (rust/2017-10-12/rust-std-1.21.0-x86_64-unknown-freebsd.tar.gz) = f76b49330c15cbcfa14865e38a05de672501688b913d0ae7ded0be2937e1b795
-SIZE (rust/2017-10-12/rust-std-1.21.0-x86_64-unknown-freebsd.tar.gz) = 58481493
-SHA256 (rust/2017-10-12/cargo-0.22.0-x86_64-unknown-freebsd.tar.gz) = 8b1d824ca94d7737f526ad4e73f482dfae40c1346fdbdf83d5c23f03657fe01d
-SIZE (rust/2017-10-12/cargo-0.22.0-x86_64-unknown-freebsd.tar.gz) = 5378813
+TIMESTAMP = 1516867033
+SHA256 (rust/rustc-1.23.0-src.tar.xz) = 7196032371b50dd5582465b3bfa79ffd783b74f0711420d99b61b26c96fb3d80
+SIZE (rust/rustc-1.23.0-src.tar.xz) = 38490016
+SHA256 (rust/2017-11-20/rustc-1.22.1-aarch64-unknown-freebsd.tar.gz) = 8baa4f7120d72c94711d5956e5a36f49b34ef8c0febd41e41d708c78a101695d
+SIZE (rust/2017-11-20/rustc-1.22.1-aarch64-unknown-freebsd.tar.gz) = 46259278
+SHA256 (rust/2017-11-20/rust-std-1.22.1-aarch64-unknown-freebsd.tar.gz) = 20c1ff644996f5e3cb29629a98deb74316f7f058840fd8364a8fb0496e94250e
+SIZE (rust/2017-11-20/rust-std-1.22.1-aarch64-unknown-freebsd.tar.gz) = 60379679
+SHA256 (rust/2017-11-20/cargo-0.23.0-aarch64-unknown-freebsd.tar.gz) = cb14de84d2cf6759d0462719b7d6c9c7df8e1b1ee33b0d8a0cb596879cce0eca
+SIZE (rust/2017-11-20/cargo-0.23.0-aarch64-unknown-freebsd.tar.gz) = 3514289
+SHA256 (rust/2017-11-20/rustc-1.22.1-i686-unknown-freebsd.tar.gz) = 123fe8182aa30b61a341a880578343f52d9a6bd2a33ebd46a6ca65b49e8201a6
+SIZE (rust/2017-11-20/rustc-1.22.1-i686-unknown-freebsd.tar.gz) = 42905719
+SHA256 (rust/2017-11-20/rust-std-1.22.1-i686-unknown-freebsd.tar.gz) = 27814d876e6487136bb4d93cfa94bbf1fedad131de8f42cb1a6547cbfdbfa3d4
+SIZE (rust/2017-11-20/rust-std-1.22.1-i686-unknown-freebsd.tar.gz) = 59252162
+SHA256 (rust/2017-11-20/cargo-0.23.0-i686-unknown-freebsd.tar.gz) = 980129817a3de98d55e7aa62d2f06ea714441d9fdb1c6e3c749529d21101814f
+SIZE (rust/2017-11-20/cargo-0.23.0-i686-unknown-freebsd.tar.gz) = 5371207
+SHA256 (rust/2017-11-20/rustc-1.22.1-x86_64-unknown-freebsd.tar.gz) = dbef9a1401c7b5237d9b0bd9bc24a6cf00a6d13766cfbabd1d7107c9a75cf5c0
+SIZE (rust/2017-11-20/rustc-1.22.1-x86_64-unknown-freebsd.tar.gz) = 42167721
+SHA256 (rust/2017-11-20/rust-std-1.22.1-x86_64-unknown-freebsd.tar.gz) = f150231092c69716565781ed9a784a06e79c52b17eb65f96a1b11c8fc987130d
+SIZE (rust/2017-11-20/rust-std-1.22.1-x86_64-unknown-freebsd.tar.gz) = 58897351
+SHA256 (rust/2017-11-20/cargo-0.23.0-x86_64-unknown-freebsd.tar.gz) = b2242d4047cd868f9ad74cd19688c0ae794356f456a03978b300f3a4d54e4fe5
+SIZE (rust/2017-11-20/cargo-0.23.0-x86_64-unknown-freebsd.tar.gz) = 5433676



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