Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Mar 2018 16:20:51 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r465189 - in head/lang: rust rust-nightly rust-nightly/files
Message-ID:  <201803211620.w2LGKpe6038768@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Wed Mar 21 16:20:51 2018
New Revision: 465189
URL: https://svnweb.freebsd.org/changeset/ports/465189

Log:
  Update rust-nightly to 2018-03-21.
  
  The ABI patch and bootstrap patching are no longer needed on head after
  fixes fully upstreamed in https://github.com/rust-lang/rust/issues/42681.

Deleted:
  head/lang/rust-nightly/files/extra-patch-abi
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 Mar 21 16:12:09 2018	(r465188)
+++ head/lang/rust-nightly/Makefile	Wed Mar 21 16:20:51 2018	(r465189)
@@ -14,11 +14,11 @@ CONFLICTS_INSTALL=	rust
 
 # Which source to pull:
 #   https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz
-NIGHTLY_DATE=			2018-03-06
+NIGHTLY_DATE=			2018-03-21
 NIGHTLY_SUBDIR=			${NIGHTLY_DATE}/
 
 # See WRKSRC/src/stage0.txt for this date
-BOOTSTRAPS_DATE=		2018-02-20
+BOOTSTRAPS_DATE=		2018-03-18
 RUST_BOOTSTRAP_VERSION=		beta
 CARGO_BOOTSTRAP_VERSION=	beta
 

Modified: head/lang/rust-nightly/distinfo
==============================================================================
--- head/lang/rust-nightly/distinfo	Wed Mar 21 16:12:09 2018	(r465188)
+++ head/lang/rust-nightly/distinfo	Wed Mar 21 16:20:51 2018	(r465189)
@@ -1,15 +1,15 @@
-SHA256 (rust/2018-02-20/cargo-beta-i686-unknown-freebsd.tar.gz) = 21b5ac5d39e6de1d312ef6c374c3c2839a3964d8fca9b3ee3ebfbdc4e0814d2a
-SIZE (rust/2018-02-20/cargo-beta-i686-unknown-freebsd.tar.gz) = 4938171
-SHA256 (rust/2018-02-20/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 1196d5594b8efcfa56bfc5127faf85f9f85d71f880e0f012ad78f13249aec415
-SIZE (rust/2018-02-20/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 5192180
-SHA256 (rust/2018-02-20/rust-std-beta-i686-unknown-freebsd.tar.gz) = 5e358d07dba8000c758b3e2f46ead3578f764f013ecca66b38692bad0adab5a5
-SIZE (rust/2018-02-20/rust-std-beta-i686-unknown-freebsd.tar.gz) = 50439483
-SHA256 (rust/2018-02-20/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 22dbb0eb548933a196e5d6d684863ca823c4f35e19afc498a715022c273bfcfd
-SIZE (rust/2018-02-20/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 50160005
-SHA256 (rust/2018-02-20/rustc-beta-i686-unknown-freebsd.tar.gz) = 0eaf0002ed85864ab2e26d6431b9f9e044c3e7b4884f217c55ae03dfafe45721
-SIZE (rust/2018-02-20/rustc-beta-i686-unknown-freebsd.tar.gz) = 56781242
-SHA256 (rust/2018-02-20/rustc-beta-x86_64-unknown-freebsd.tar.gz) = d602781ac44e6c43bbe64a31ba0ca709b0d3ebb010ff645893f1912fb4237062
-SIZE (rust/2018-02-20/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 56350926
-SHA256 (rust/2018-03-06/rustc-nightly-src.tar.xz) = 78bc897c6ceda1df07acd31b69151f70d285777f40c2c203cc26b70f86417dbd
-SIZE (rust/2018-03-06/rustc-nightly-src.tar.xz) = 52098524
-TIMESTAMP = 1520533854
+SHA256 (rust/2018-03-18/cargo-beta-i686-unknown-freebsd.tar.gz) = 801354131957df03abedc8b11be483520941632a6976a7fdefde157e53b70391
+SIZE (rust/2018-03-18/cargo-beta-i686-unknown-freebsd.tar.gz) = 4918903
+SHA256 (rust/2018-03-18/cargo-beta-x86_64-unknown-freebsd.tar.gz) = ed420d91219f86ffa586cd773f19f75c0e192b683e7a7282580faf5b72c7b9de
+SIZE (rust/2018-03-18/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 5209143
+SHA256 (rust/2018-03-18/rust-std-beta-i686-unknown-freebsd.tar.gz) = 5a8135389201352f79ee16bd13555fbb192012c43733c997dc6a60061f6b24a6
+SIZE (rust/2018-03-18/rust-std-beta-i686-unknown-freebsd.tar.gz) = 50414392
+SHA256 (rust/2018-03-18/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 86907a7beaa22f52bd093898e0818048bb1ef4b2d45968fb794f69425c345004
+SIZE (rust/2018-03-18/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 50222097
+SHA256 (rust/2018-03-18/rustc-beta-i686-unknown-freebsd.tar.gz) = 3c34727da3299eb2f847320221eb258b1eac7a2ccca6e2b0b4752c32c763fc17
+SIZE (rust/2018-03-18/rustc-beta-i686-unknown-freebsd.tar.gz) = 56749552
+SHA256 (rust/2018-03-18/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 2d00f24c2bfd8112d798d0aab70ec60f12ad6978b5029f83d477345101a46cba
+SIZE (rust/2018-03-18/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 56562280
+SHA256 (rust/2018-03-21/rustc-nightly-src.tar.xz) = 2373bc3efef22cd53111a8c7126331bc352cb241d575f810c9825deeaeb4d948
+SIZE (rust/2018-03-21/rustc-nightly-src.tar.xz) = 54550216
+TIMESTAMP = 1521593210

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Wed Mar 21 16:12:09 2018	(r465188)
+++ head/lang/rust/Makefile	Wed Mar 21 16:20:51 2018	(r465189)
@@ -92,8 +92,13 @@ PLIST_FILES=		lib/rustlib/components \
 			lib/rustlib/rust-installer-version
 
 .include <bsd.port.pre.mk>
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031
+# ABI patch needed to address ino64 before fixes upstreamed.
+# https://github.com/rust-lang/rust/issues/42681
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 && !defined(NIGHTLY_DATE)
+NEED_ABI_PATCH=		1
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-abi
+.else
+NEED_ABI_PATCH=		0
 .endif
 
 X_PY_ENV=	HOME="${WRKDIR}" \
@@ -135,13 +140,13 @@ post-extract:
 		${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}
 	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP} \
 		${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}
-.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1200031
+.if ${NEED_ABI_PATCH} == 0
 	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} \
 		${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}
 .endif
 	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP} \
 		${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031
+.if ${NEED_ABI_PATCH} == 1
 	${TAR} -x -C ${WRKSRC} -f ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP}
 	${CC} ${CFLAGS} -fPIC -c -o ${WRKSRC}/old_fstat.o ${FILESDIR}/old_fstat.c
 	(set -ex; cd ${WRKSRC}; \



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