pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rustc: update to 1.15.1

Module Name:	pkgsrc-wip
Committed By:	Jonathan A. Kollasch <jakllsch%kollasch.net@localhost>
Pushed By:	jakllsch
Date:		Wed Feb 15 22:34:27 2017 -0600
Changeset:	d8e258e4368b1cb6c827926c61aeb55ad36c40ee

Modified Files:
	rustc/Makefile
	rustc/PLIST
	rustc/distinfo
	rustc/patches/patch-src_rust-installer_gen-installer.sh
Added Files:
	rustc/patches/patch-src_bootstrap_native.rs
	rustc/patches/patch-src_libbacktrace_configure
	rustc/patches/patch-src_libcompiler__builtins_build.rs
Removed Files:
	rustc/patches/patch-mk_main.mk
	rustc/patches/patch-mk_rustllvm.mk
	rustc/patches/patch-mk_target.mk
	rustc/patches/patch-src_liblibc_src_unix_solaris_mod.rs
	rustc/patches/patch-src_librustc__back_target_x86__64__unknown__netbsd.rs
	rustc/patches/patch-src_llvm_utils_buildit_build__llvm

Log Message:
rustc: update to 1.15.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d8e258e4368b1cb6c827926c61aeb55ad36c40ee

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rustc/Makefile                                     | 141 +++++++++++++--------
 rustc/PLIST                                        |  91 +------------
 rustc/distinfo                                     | 111 +++++++++++-----
 rustc/patches/patch-mk_main.mk                     |  24 ----
 rustc/patches/patch-mk_rustllvm.mk                 |  23 ----
 rustc/patches/patch-mk_target.mk                   |  15 ---
 rustc/patches/patch-src_bootstrap_native.rs        |  14 ++
 rustc/patches/patch-src_libbacktrace_configure     |  13 ++
 .../patch-src_libcompiler__builtins_build.rs       |  14 ++
 .../patch-src_liblibc_src_unix_solaris_mod.rs      |  14 --
 ...brustc__back_target_x86__64__unknown__netbsd.rs |  15 ---
 .../patch-src_llvm_utils_buildit_build__llvm       |  15 ---
 .../patch-src_rust-installer_gen-installer.sh      |  15 +--
 13 files changed, 216 insertions(+), 289 deletions(-)

diffs:
diff --git a/rustc/Makefile b/rustc/Makefile
index 47c5c29ff6..32fe71d70f 100755
--- a/rustc/Makefile
+++ b/rustc/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-RUST_VERSION=	1.10.0
+RUST_VERSION=	1.15.1
 DISTNAME=	rustc-${RUST_VERSION}-src
 PKGNAME=	rustc-${RUST_VERSION}
 CATEGORIES=	lang
@@ -11,45 +11,31 @@ HOMEPAGE=	https://www.rust-lang.org/
 COMMENT=	Safe, concurrent, practical language
 LICENSE=	mit OR apache-2.0
 
+DIST_SUBDIR=	${PKGNAME_NOREV}
+
 #BUILD_DEPENDS+=	curl-[0-9]*:../../www/curl
 
-PYTHON_VERSIONS_ACCEPTED=	27 # as of 1.9.0
+PYTHON_VERSIONS_ACCEPTED=	27 # as of 1.15.1
+PYTHON_FOR_BUILD_ONLY=		yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+=	--llvm-root=${BUILDLINK_PREFIX.libLLVM}
+#CONFIGURE_ARGS+=	--llvm-root=${BUILDLINK_PREFIX.libLLVM}
+#CONFIGURE_ARGS+=	--python=python
 CONFIGURE_ARGS+=	--disable-jemalloc  # XXX NetBSD only?
 CONFIGURE_ARGS+=	--disable-codegen-tests # otherwise needs LLVM's FileCheck executable, which libLLVM doesn't install
 
 USE_LANGUAGES=	c c++
 GCC_REQD=	4.7 4.8
-USE_TOOLS+=	bash gmake gsed perl
+USE_TOOLS+=	bash gmake gsed perl tar
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
+CHECK_PORTABILITY_SKIP+=	src/grammar/check.sh
 
 # for guidance: http://www.ntecs.de/blog/2014/07/29/rust-ported-to-dragonflybsd/
 # XXX problem with libtool wrapper
 # XXX needs python during build
 
-RUSTFLAGS_rustc=-L native=${WRKSRC}/${RUST_ARCH}/rt -C link-args="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libLLVM}/lib/libLLVM -lrustllvm -lLLVM-3.8"
-RUSTFLAGS_rustc_llvm=-L native=${WRKSRC}/${RUST_ARCH}/rt -C link-args="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libLLVM}/lib/libLLVM -lrustllvm -lLLVM-3.8"
-RUSTFLAGS_rustc_metadata=-L native=${WRKSRC}/${RUST_ARCH}/rt -C link-args="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libLLVM}/lib/libLLVM -lrustllvm -lLLVM-3.8"
-RUSTFLAGS_rustc_trans=-L native=${WRKSRC}/${RUST_ARCH}/rt -C link-args="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libLLVM}/lib/libLLVM -lrustllvm -lLLVM-3.8"
-
-MAKE_ENV+=	RUSTFLAGS0_rustc=${RUSTFLAGS_rustc:Q}
-MAKE_ENV+=	RUSTFLAGS1_rustc=${RUSTFLAGS_rustc:Q}
-MAKE_ENV+=	RUSTFLAGS2_rustc=${RUSTFLAGS_rustc:Q}
-MAKE_ENV+=	RUSTFLAGS0_rustc_llvm=${RUSTFLAGS_rustc_llvm:Q}
-MAKE_ENV+=	RUSTFLAGS1_rustc_llvm=${RUSTFLAGS_rustc_llvm:Q}
-MAKE_ENV+=	RUSTFLAGS2_rustc_llvm=${RUSTFLAGS_rustc_llvm:Q}
-MAKE_ENV+=	RUSTFLAGS0_rustc_metadata=${RUSTFLAGS_rustc_metadata:Q}
-MAKE_ENV+=	RUSTFLAGS1_rustc_metadata=${RUSTFLAGS_rustc_metadata:Q}
-MAKE_ENV+=	RUSTFLAGS2_rustc_metadata=${RUSTFLAGS_rustc_metadata:Q}
-MAKE_ENV+=	RUSTFLAGS0_rustc_trans=${RUSTFLAGS_rustc_trans:Q}
-MAKE_ENV+=	RUSTFLAGS1_rustc_trans=${RUSTFLAGS_rustc_trans:Q}
-MAKE_ENV+=	RUSTFLAGS2_rustc_trans=${RUSTFLAGS_rustc_trans:Q}
-
 REPLACE_BASH+=	src/rust-installer/gen-install-script.sh
 REPLACE_BASH+=	src/rust-installer/gen-installer.sh
 
@@ -70,58 +56,89 @@ TEST_TARGET=	check
 #
 .include "../../mk/bsd.prefs.mk"
 NOT_FOR_PLATFORM=	*-*-alpha *-*-vax # not targeted by LLVM
-NOT_FOR_PLATFORM+=	*-*-sparc* # not targeted by Rust
+NOT_FOR_PLATFORM+=	*-*-sparc* # not targeted by Rust in this version
 NOT_FOR_PLATFORM+=	Interix-*-* # not supported via pkgsrc, needs MinGW
 
-RUST_STAGE0_VERSION:=	1.9.0
+RUST_STAGE0_VERSION:=	1.14.0
+RUST_STAGE0_DATE:=	2016-12-18
+RUST_CARGO0_DISTHASH:=	fbeea902d2c9a5be6d99cc35681565d8f7832592
+
+DISTFILES:=		${DEFAULT_DISTFILES}
 
 # Tier 1:
-.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo)
-RUST_ARCH=		i686-apple-darwin
+.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
+RUST_ARCH:=		i686-apple-darwin
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0}
+RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
+RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
+SITES.${RUST_CARGO0}= \
+	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
+DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
 RUST_ARCH:=		x86_64-apple-darwin
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0}
+RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
+RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
+SITES.${RUST_CARGO0}= \
+	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
+DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
 RUST_ARCH:=		i686-unknown-linux-gnu
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0}
+RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
+RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
+SITES.${RUST_CARGO0}= \
+	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
+DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
 RUST_ARCH:=		x86_64-unknown-linux-gnu
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0}
+RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
+RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
+SITES.${RUST_CARGO0}= \
+	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
+DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
 
-
 # Tier 2 (XXX currently incomplete):
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
 RUST_ARCH:=		x86_64-unknown-netbsd
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0}
+RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
+RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
+SITES.${RUST_CARGO0}= \
+	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
+DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
 RUST_ARCH:=		x86_64-unknown-freebsd
 RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0}
+RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
+RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
+SITES.${RUST_CARGO0}= \
+	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
+DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 .endif
 
 # Tier 3
-#.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo)
-#RUST_ARCH=		x86_64-sun-solaris
+#.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
+#RUST_ARCH:=		x86_64-sun-solaris
 #RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-#DISTFILES:=		${DISTFILES} ${RUST_STAGE0}
+#DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
+#RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
+#RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
+#SITES.${RUST_CARGO0}= \
+#	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
 #.endif
 
-.if empty(RUST_STAGE0)
+.if empty(RUST_STAGE0) || empty(RUST_STD0) || empty(RUST_CARGO0)
 PKG_FAIL_REASON:=	"Not currently aware of Stage 0 bootstrap kit for ${MACHINE_PLATFORM}"
 .endif
 
@@ -140,19 +157,28 @@ PLIST_VARS+=		jemalloc
 
 CONFIGURE_ARGS+=	--build=${RUST_ARCH}
 
+MAKE_ENV+=	RUSTC_FLAGS=-C\ link-args=${COMPILER_RPATH_FLAG}${PREFIX}/lib/rustlib/${RUST_ARCH}/lib
+MAKE_ENV+=	RUSTFLAGS=-C\ link-args=${COMPILER_RPATH_FLAG}${PREFIX}/lib/rustlib/${RUST_ARCH}/lib
+
+post-wrapper:
+	${RUN}${ECHO} 'transform=R:$$ORIGIN/../lib:'${PREFIX}/lib/rustlib/${RUST_ARCH}/lib >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.cc}
+	${RUN}${ECHO} 'transform=R:$$ORIGIN/../lib:'${PREFIX}/lib/rustlib/${RUST_ARCH}/lib >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.cxx}
+	${RUN}${ECHO} append=${COMPILER_RPATH_FLAG}${PREFIX}/lib/rustlib/${RUST_ARCH}/lib >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.cc}
+	${RUN}${ECHO} append=${COMPILER_RPATH_FLAG}${PREFIX}/lib/rustlib/${RUST_ARCH}/lib >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.cxx}
+
 EXTRACT_ONLY=		${DEFAULT_DISTFILES}
 
-RUST_VERHASH=		2f39a9bd
 PLIST_SUBST+=		RUST_ARCH=${RUST_ARCH:Q}
-PLIST_SUBST+=		RUST_VERHASH=${RUST_VERHASH:Q}
 PLIST_SUBST+=		SOEXT=${SOEXT:Q}
 PRINT_PLIST_AWK+=	{ gsub(/${RUST_ARCH}/, "$${RUST_ARCH}") }
-PRINT_PLIST_AWK+=	{ gsub(/${RUST_VERHASH}/, "$${RUST_VERHASH}") }
 PRINT_PLIST_AWK+=	{ gsub(/\.${SOEXT}/, ".$${SOEXT}") }
 
 post-extract:
-	${MKDIR} ${WRKSRC}/dl
-	${CP} ${DISTDIR}/${RUST_STAGE0} ${WRKSRC}/dl
+	${MKDIR} ${WRKSRC}/build/cache/${RUST_STAGE0_DATE}
+	${CP} -a ${DISTDIR}/${DIST_SUBDIR}/${RUST_STAGE0} ${WRKSRC}/build/cache/${RUST_STAGE0_DATE}/
+	${CP} -a ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD0} ${WRKSRC}/build/cache/${RUST_STAGE0_DATE}/
+	${MKDIR} ${WRKSRC}/build/cache/${RUST_CARGO0_DISTHASH}
+	${CP} -a ${DISTDIR}/${DIST_SUBDIR}/${RUST_CARGO0} ${WRKSRC}/build/cache/${RUST_CARGO0_DISTHASH}/
 
 .if ${OPSYS} == "SunOS"
 BUILD_DEPENDS+=		grep>=0:../../textproc/grep
@@ -167,14 +193,21 @@ SUBST_FILES.ranlib=	mk/rt.mk
 SUBST_SED.ranlib=	-e 's,RANLIB=.* \\,RANLIB="true" \\,g'
 .endif
 
-#snapshot:
-#	${RUN} cd ${WRKSRC:Q} && ${BUILD_MAKE_CMD} snap-stage3
-
 post-install:
+	cd ${WRKDIR} && \
+	${TAR} -pzxf ${WRKSRC}/build/dist/rust-std-${RUST_VERSION}-${RUST_ARCH}.tar.gz && \
+	cd rust-std-${RUST_VERSION}-${RUST_ARCH} && \
+	./install.sh --disable-ldconfig --disable-verify --destdir=${DESTDIR} --prefix=${PREFIX} --mandir=${PKGMANDIR}
+	cd ${WRKDIR} && \
+	${TAR} -pzxf ${WRKSRC}/build/dist/rustc-${RUST_VERSION}-${RUST_ARCH}.tar.gz && \
+	cd ${WRKDIR}/rustc-${RUST_VERSION}-${RUST_ARCH} && \
+	./install.sh --disable-ldconfig --disable-verify --destdir=${DESTDIR} --prefix=${PREFIX} --mandir=${PKGMANDIR}
 	${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/install.log
 
-.include "../../lang/libLLVM/buildlink3.mk"
-.include "../../lang/llvm/buildlink3.mk"
-.include "../../lang/libunwind/buildlink3.mk"
+GENERATE_PLIST+=  cd ${DESTDIR}${PREFIX} && ${FIND} lib lib/rustlib/${RUST_ARCH}/lib \( -type f -or -type l \) -and -name 'lib*-*.*' | ${SORT} -dr;
+
+#.include "../../lang/libLLVM/buildlink3.mk"
+#.include "../../lang/llvm/buildlink3.mk"
+#.include "../../lang/libunwind/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/rustc/PLIST b/rustc/PLIST
index 4b74a0106c..eec2fc45e0 100644
--- a/rustc/PLIST
+++ b/rustc/PLIST
@@ -1,98 +1,17 @@
 @comment $NetBSD$
+bin/rust-gdb
+bin/rust-lldb
 bin/rustc
 bin/rustdoc
-lib/libarena-${RUST_VERHASH}.${SOEXT}
-lib/libflate-${RUST_VERHASH}.${SOEXT}
-lib/libfmt_macros-${RUST_VERHASH}.${SOEXT}
-lib/libgetopts-${RUST_VERHASH}.${SOEXT}
-lib/libgraphviz-${RUST_VERHASH}.${SOEXT}
-lib/liblog-${RUST_VERHASH}.${SOEXT}
-lib/librbml-${RUST_VERHASH}.${SOEXT}
-lib/librustc-${RUST_VERHASH}.${SOEXT}
-lib/librustc_back-${RUST_VERHASH}.${SOEXT}
-lib/librustc_borrowck-${RUST_VERHASH}.${SOEXT}
-lib/librustc_const_eval-${RUST_VERHASH}.${SOEXT}
-lib/librustc_const_math-${RUST_VERHASH}.${SOEXT}
-lib/librustc_data_structures-${RUST_VERHASH}.${SOEXT}
-lib/librustc_driver-${RUST_VERHASH}.${SOEXT}
-lib/librustc_incremental-${RUST_VERHASH}.${SOEXT}
-lib/librustc_lint-${RUST_VERHASH}.${SOEXT}
-lib/librustc_llvm-${RUST_VERHASH}.${SOEXT}
-lib/librustc_metadata-${RUST_VERHASH}.${SOEXT}
-lib/librustc_mir-${RUST_VERHASH}.${SOEXT}
-lib/librustc_passes-${RUST_VERHASH}.${SOEXT}
-lib/librustc_platform_intrinsics-${RUST_VERHASH}.${SOEXT}
-lib/librustc_plugin-${RUST_VERHASH}.${SOEXT}
-lib/librustc_privacy-${RUST_VERHASH}.${SOEXT}
-lib/librustc_resolve-${RUST_VERHASH}.${SOEXT}
-lib/librustc_save_analysis-${RUST_VERHASH}.${SOEXT}
-lib/librustc_trans-${RUST_VERHASH}.${SOEXT}
-lib/librustc_typeck-${RUST_VERHASH}.${SOEXT}
-lib/librustdoc-${RUST_VERHASH}.${SOEXT}
-lib/libserialize-${RUST_VERHASH}.${SOEXT}
-lib/libstd-${RUST_VERHASH}.${SOEXT}
-lib/libsyntax-${RUST_VERHASH}.${SOEXT}
-lib/libsyntax_ext-${RUST_VERHASH}.${SOEXT}
-lib/libterm-${RUST_VERHASH}.${SOEXT}
-lib/libtest-${RUST_VERHASH}.${SOEXT}
 lib/rustlib/components
 lib/rustlib/etc/debugger_pretty_printers_common.py
+lib/rustlib/etc/gdb_load_rust_pretty_printers.py
+lib/rustlib/etc/gdb_rust_pretty_printing.py
+lib/rustlib/etc/lldb_rust_formatters.py
 lib/rustlib/manifest-rust-std-${RUST_ARCH}
 lib/rustlib/manifest-rustc
 lib/rustlib/rust-installer-version
 lib/rustlib/uninstall.sh
-lib/rustlib/${RUST_ARCH}/lib/liballoc-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/liballoc_system-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libarena-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libcollections-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libcompiler-rt.a
-lib/rustlib/${RUST_ARCH}/lib/libcore-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libflate-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libfmt_macros-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libgetopts-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libgetopts-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libgraphviz-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/liblibc-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/liblog-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libpanic_abort-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libpanic_unwind-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/librand-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/librbml-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_back-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_bitflags-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/librustc_borrowck-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_const_eval-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_const_math-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_data_structures-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_driver-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_incremental-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_lint-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_llvm-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_metadata-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_mir-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_passes-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_platform_intrinsics-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_plugin-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_privacy-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_resolve-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_save_analysis-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_trans-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_typeck-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_unicode-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/librustdoc-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libserialize-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libstd-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libstd-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libsyntax-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libsyntax_ext-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libterm-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libterm-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libtest-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libtest-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libunwind-${RUST_VERHASH}.rlib
-man/man1/rustc.1
-man/man1/rustdoc.1
 share/doc/rust/COPYRIGHT
 share/doc/rust/LICENSE-APACHE
 share/doc/rust/LICENSE-MIT
diff --git a/rustc/distinfo b/rustc/distinfo
index c5c02a0ded..27037017e8 100644
--- a/rustc/distinfo
+++ b/rustc/distinfo
@@ -1,37 +1,86 @@
 $NetBSD$
 
-SHA1 (rustc-1.9.0-i686-apple-darwin.tar.gz) = 8182b75431795344ca62d6916b46f8234d2d4386
-RMD160 (rustc-1.9.0-i686-apple-darwin.tar.gz) = a8d948dea066f79c0c5c2bd9713d1f0a91d13758
-SHA512 (rustc-1.9.0-i686-apple-darwin.tar.gz) = c6b8d709df2e76d94b504e9bc3defef7eec06743373ffd3a0131f32074e6c626b9b4e31bd924fac54cba959ace050abef9b49b32fe43e3bcf577381e90cd54a9
-Size (rustc-1.9.0-i686-apple-darwin.tar.gz) = 40978445 bytes
-SHA1 (rustc-1.9.0-i686-unknown-linux-gnu.tar.gz) = 4ceef4184909f7557b4670c3c18bec9773599da2
-RMD160 (rustc-1.9.0-i686-unknown-linux-gnu.tar.gz) = 99d732ea2c2f60616d3ac206972b06dc96274aa2
-SHA512 (rustc-1.9.0-i686-unknown-linux-gnu.tar.gz) = 6d799a464f93aecb24ded4e9af634d7852f9930968814700e90353888657f9f556dda156455cb8cabca0e5f42c8d0f7864d43294687c8ce57518e21bebad99f7
-Size (rustc-1.9.0-i686-unknown-linux-gnu.tar.gz) = 45887218 bytes
-SHA1 (rustc-1.9.0-x86_64-apple-darwin.tar.gz) = d5e4dbb11714e522759cd129d4e34398ab84d0d4
-RMD160 (rustc-1.9.0-x86_64-apple-darwin.tar.gz) = 876af28a2edca52a41feca099434a428ac25ea2c
-SHA512 (rustc-1.9.0-x86_64-apple-darwin.tar.gz) = 18cbb4e2c465832aa496d6f3cd8de745e6d7eb3e73b8537993911418bb240c41dc7b54b4e0dc283b249429b0c591e4220233092eeef73efb1f6d9e161f193abd
-Size (rustc-1.9.0-x86_64-apple-darwin.tar.gz) = 41027645 bytes
-SHA1 (rustc-1.9.0-x86_64-unknown-freebsd.tar.gz) = 7b5186b1b731705450f5fb90e3bf2fa713c79af8
-RMD160 (rustc-1.9.0-x86_64-unknown-freebsd.tar.gz) = 0ac73b0107ab6b92b13f967fb7ddbdb96f001946
-SHA512 (rustc-1.9.0-x86_64-unknown-freebsd.tar.gz) = 4656c8a9adb6bfbfff2d7a9fb93d6aaaf50c9089cd347ebc201014a3d9428ead6bfa4bbfc512cd7ec104eb6f27ce57ffeeacfc03663e043321cacacef6e29137
-Size (rustc-1.9.0-x86_64-unknown-freebsd.tar.gz) = 47969295 bytes
-SHA1 (rustc-1.9.0-x86_64-unknown-linux-gnu.tar.gz) = 630d1df4e00f8683df512225e39cdfd057728c80
-RMD160 (rustc-1.9.0-x86_64-unknown-linux-gnu.tar.gz) = e8c47e316f020a80275e9d053a1790a7011ec663
-SHA512 (rustc-1.9.0-x86_64-unknown-linux-gnu.tar.gz) = 37a4c62f09e2b49cf7a898eeefd3843ef17f3dc433a4f55cb5c3d5c315effb9e0750c275bb0fc91e5ada6c42924af5c7f890874c5917d41a4723c60b209d1c0d
-Size (rustc-1.9.0-x86_64-unknown-linux-gnu.tar.gz) = 45246956 bytes
-SHA1 (rustc-1.9.0-x86_64-unknown-netbsd.tar.gz) = f2547822eabbea38f607b2eeaf24bca5d6eefa2f
-RMD160 (rustc-1.9.0-x86_64-unknown-netbsd.tar.gz) = 6bb37873b783d097caebe74c70aecc9690707fde
-SHA512 (rustc-1.9.0-x86_64-unknown-netbsd.tar.gz) = f8ec3e83b7042ec5b5571fc6bd7d1486c32a081f397258f872d37b760fc8cd0a7911d60685a43d2e3846bae919e95d6d04e1465f48fafc7d8384870072fec2bd
-Size (rustc-1.9.0-x86_64-unknown-netbsd.tar.gz) = 46162482 bytes
+SHA1 (rustc-1.15.1/cargo-nightly-i686-apple-darwin.tar.gz) = 45110e696578d99927d8e85f7bd6c38b0c34de6a
+RMD160 (rustc-1.15.1/cargo-nightly-i686-apple-darwin.tar.gz) = cb84e34472ff1363f9146059b6caaa48e70bd7a0
+SHA512 (rustc-1.15.1/cargo-nightly-i686-apple-darwin.tar.gz) = 4fed5f24431a6db5ebf4eff9bd5f3aa764803d952259e903253d5c5932d1ede1a7f763575b5f54a84d6f8ea1141f9fdcc21c4dad29b393c7b99e10c558a63a21
+Size (rustc-1.15.1/cargo-nightly-i686-apple-darwin.tar.gz) = 3103231 bytes
+SHA1 (rustc-1.15.1/cargo-nightly-i686-unknown-linux-gnu.tar.gz) = 1cb208933e3a14f5082449345cfa383f37a67e7e
+RMD160 (rustc-1.15.1/cargo-nightly-i686-unknown-linux-gnu.tar.gz) = 0bcb593a7b8ae01d6ee14d75ac0e2c7a13d50b87
+SHA512 (rustc-1.15.1/cargo-nightly-i686-unknown-linux-gnu.tar.gz) = 4db3a1586c4103fdedbb2a56f1039b9bdc72e9f5ca3b4482aed526771262b7c048f4481d10b0325904060c60a3e1de17352aba9314177572800961b5f3d20e9b
+Size (rustc-1.15.1/cargo-nightly-i686-unknown-linux-gnu.tar.gz) = 4168730 bytes
+SHA1 (rustc-1.15.1/cargo-nightly-x86_64-apple-darwin.tar.gz) = 2719ec3ed2592ae3bbde972e8ab05c68df9f0cbc
+RMD160 (rustc-1.15.1/cargo-nightly-x86_64-apple-darwin.tar.gz) = 3b2d283a8a2711894936a929a4c04835dd9ccd6a
+SHA512 (rustc-1.15.1/cargo-nightly-x86_64-apple-darwin.tar.gz) = 8f2f43c19378b952900ef9b4448e1cd1c2e5da2514de9a126137a5eb3af7dfeda276a3af462be829e1c82383fe9c4d0372dc78bd0a668b8dc17d76bddc779e30
+Size (rustc-1.15.1/cargo-nightly-x86_64-apple-darwin.tar.gz) = 3344960 bytes
+SHA1 (rustc-1.15.1/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 68eb22638c8dfb43b5f6fffdcb2d5ae7af6d0a3e
+RMD160 (rustc-1.15.1/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 0a82b9266435ce349f53ac8f886a3d527c725843
+SHA512 (rustc-1.15.1/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 38c84e921bebffb0573a03e9031443d331ae69a6b9d6d97277b05a5b1d160f0548b5a56e15d688a88f5c7708c749bd564fc3d6483791a1d4a44eb9af33de1232
+Size (rustc-1.15.1/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4584208 bytes
+SHA1 (rustc-1.15.1/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz) = 0ed542f43acdee18b4eeb4de297869cbf16686d6
+RMD160 (rustc-1.15.1/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz) = b6db3aa800bea4f2380f519483b406e84407a5a0
+SHA512 (rustc-1.15.1/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz) = 1e558f7d351d42f29ec39b9a0bf6b6ec550e944c46f6b88f475128039a7750378f40a669d99a21bcbf83cc0072e924187b47ab160cd7af2501076c4a88993f22
+Size (rustc-1.15.1/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz) = 4180436 bytes
+SHA1 (rustc-1.15.1/cargo-nightly-x86_64-unknown-netbsd.tar.gz) = 845c5249ece8b4de95c1b568b50876a4715dde53
+RMD160 (rustc-1.15.1/cargo-nightly-x86_64-unknown-netbsd.tar.gz) = abd6aef6574a2cc62bfc3e3182010cc8ef4efcc2
+SHA512 (rustc-1.15.1/cargo-nightly-x86_64-unknown-netbsd.tar.gz) = 9522581702074be1372e03347d14189b46a8829fc941a1f145b42c8474569f2518dc5a0357cdfb893689e21f79cfbebf5eda7f9e61757b1a43c3964f63c327a6
+Size (rustc-1.15.1/cargo-nightly-x86_64-unknown-netbsd.tar.gz) = 3992899 bytes
+SHA1 (rustc-1.15.1/rust-std-1.14.0-i686-apple-darwin.tar.gz) = 06002c859520adf7bd3b0f905b360a469604d7e3
+RMD160 (rustc-1.15.1/rust-std-1.14.0-i686-apple-darwin.tar.gz) = 8c9b3353e70efdf01339dd81a94a3f0e579aa227
+SHA512 (rustc-1.15.1/rust-std-1.14.0-i686-apple-darwin.tar.gz) = c9d1efd75d2d7fffbe6a0ff10f3516947d90d212e64e20e06e433251c590d630757e0ad466297fdcee141490b84a81d1e317a1de89d51afd97230834352787a1
+Size (rustc-1.15.1/rust-std-1.14.0-i686-apple-darwin.tar.gz) = 42979079 bytes
+SHA1 (rustc-1.15.1/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz) = ab30ddc769c771356f0392ba8c015fd3959b2c8a
+RMD160 (rustc-1.15.1/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz) = 0e388a899439fd1d07fdaa1304a719abcf5dbed4
+SHA512 (rustc-1.15.1/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz) = 0ace7025c0b89af7cc74c3bd08065f4c02d4f00544197b6bafd63478536c9f2b849ed85b7177708e601abb46fcc55a180abfe8c758ba9493c65308fb598aedd8
+Size (rustc-1.15.1/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz) = 61245054 bytes
+SHA1 (rustc-1.15.1/rust-std-1.14.0-x86_64-apple-darwin.tar.gz) = 18275167c9487454eeb8073cd0dcd6ae01df2ca0
+RMD160 (rustc-1.15.1/rust-std-1.14.0-x86_64-apple-darwin.tar.gz) = bed0e9dc68de37593bc0c581e5c320225ab726aa
+SHA512 (rustc-1.15.1/rust-std-1.14.0-x86_64-apple-darwin.tar.gz) = 8cb0b75382112efd12b15cdeb4052a2a04087efd0410ce433c8aaa6f6beecbfb9f081c22b288a97812ad211e01117032cc0e6c87e63670276b5e8462e3e193e0
+Size (rustc-1.15.1/rust-std-1.14.0-x86_64-apple-darwin.tar.gz) = 43320505 bytes
+SHA1 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = 62a3e4d16d7fd1299b3311ad63e2ad176f6e8693
+RMD160 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = 9f436d31d3f37d2fab6737a006be4057cc4a580d
+SHA512 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = df6931d95104c8ed4797548d4baa2ecc9490dea14bc48a7b4d07a7006cc76b14b3cf464c7c7daecc02b6ed43e503b7000b8f70130b552eaf1e26eb5b15ea3a3d
+Size (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = 65211300 bytes
+SHA1 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 91dbf4880e5c24227b0ca3a1de3bb901acb07658
+RMD160 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = c9ccedd285b034f5ca5ac97e5b38ac0dcca2f360
+SHA512 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = a30bcc90c7fbc40acb92223b8d9e224ee2407d15d28d70164f8f9ecd3e3612647115b382b2ec0deffaf44ff451db697c26b2def38e4043ef77f8b60a2cf7d185
+Size (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 59591949 bytes
+SHA1 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-netbsd.tar.gz) = e7828e5d1810b3cf56677a68960d9cb9c55468ae
+RMD160 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-netbsd.tar.gz) = 7eda1fcd8e3e4cf1c2e9d749f5b511cff9035c60
+SHA512 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-netbsd.tar.gz) = e48b0b926aecbd9683dd54510c3842b4099c28edba136b89b18835cdae252bd8fd7b62dc2f2ef9728bf32fe05e73de665b9810ea539ba678fff91e5607b648b5
+Size (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-netbsd.tar.gz) = 64118638 bytes
+SHA1 (rustc-1.15.1/rustc-1.14.0-i686-apple-darwin.tar.gz) = de2e88096fc6e60f499a92b1c96f8463f001c708
+RMD160 (rustc-1.15.1/rustc-1.14.0-i686-apple-darwin.tar.gz) = 46c0a5d281eba6266411b2a68844242f5a877392
+SHA512 (rustc-1.15.1/rustc-1.14.0-i686-apple-darwin.tar.gz) = e79b1a0e7ff8ac91bcec3c236afd0f009742d51f66ba215253fcc61ae276d4ae3f9128f16f484f07ce5b415d99f545d2dcb4000e8356306b05f8833f33289b6a
+Size (rustc-1.15.1/rustc-1.14.0-i686-apple-darwin.tar.gz) = 32785980 bytes
+SHA1 (rustc-1.15.1/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz) = 7b53c23ba64cea031067009ed3be3ff3fb264190
+RMD160 (rustc-1.15.1/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz) = 8d7b41d99bbb145d818887a1504069029e938d67
+SHA512 (rustc-1.15.1/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz) = 4a951439d8c001b8ff2f6aa2f505e23130209494026fdacea019aef05bebb2f0d3404df047ccedbe9f4140cb5163404db22a5b0977752c495fc45f739d1252fb
+Size (rustc-1.15.1/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz) = 51391277 bytes
+SHA1 (rustc-1.15.1/rustc-1.14.0-x86_64-apple-darwin.tar.gz) = 3c82993aa1f578d5edd2939c3b145a06b686d3fe
+RMD160 (rustc-1.15.1/rustc-1.14.0-x86_64-apple-darwin.tar.gz) = 844fad941197594cb3dcd1f74b79429fc3c82221
+SHA512 (rustc-1.15.1/rustc-1.14.0-x86_64-apple-darwin.tar.gz) = a938dadffe6d6ae44eeda97cb32b32ddef28ce8a9607a1840d1f58b301f819a5d3a53dfb70c1a892b9d98df8556d5d0638ed366ecb30fbf644c6a0cc8f977c1c
+Size (rustc-1.15.1/rustc-1.14.0-x86_64-apple-darwin.tar.gz) = 32979416 bytes
+SHA1 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 177d293f259fdf9002f9182d209a0765974697e3
+RMD160 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 3ee5aa62496bdbbd966b407304954c9983500dda
+SHA512 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 0e530d68ad98bc4b8b6d78d3817c4aeaa8c68f38e3dd5368d9dc700ee731b6ae6ae50ee757d06af91c44144c517b8262fbb55126d23c16fec34c2a7e0c84a8a9
+Size (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 51459091 bytes
+SHA1 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 4f144f1b3da969a3d118ea334e70995736832cfc
+RMD160 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = bdf4315a56adef3ccb3ed2957bb557f8673f74e7
+SHA512 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = da33a8c509d3a554bed3173f8cdd6fc3639646e5b12eae80654d83290160227238c6f9ff9c0247d63a90f48eeafc8dc31a4a02575ba43fa6d5f75ae58a347c32
+Size (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 49370951 bytes
+SHA1 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-netbsd.tar.gz) = 20ab1bb2174e77728e10c022f185977dc5634906
+RMD160 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-netbsd.tar.gz) = f4e311a87cbb87ae7b6cbe937fba90ca5628437c
+SHA512 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-netbsd.tar.gz) = 0bc35435f0ee7f93ac05527bd3d4927ce90bb7bea444ce4040eb5e2f4b0c0216acf4f2f9520741e1eac0fb23c916546685e0ed90a9b0bd54a5a209abdfe1ff33
+Size (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-netbsd.tar.gz) = 50325084 bytes
+SHA1 (rustc-1.15.1/rustc-1.15.1-src.tar.gz) = a5f4b21eeb0fb8ff0e156883aca16759ffb45f05
+RMD160 (rustc-1.15.1/rustc-1.15.1-src.tar.gz) = d98f20326938e780e016d08425dbc7f314d3e7c8
+SHA512 (rustc-1.15.1/rustc-1.15.1-src.tar.gz) = 10d533b17cf7f92b9dff14b399b5dd0ac8b68284eea072c85ede78a4e4c2c4fce8c781777124c64798057aceb6444535e02e067fd67ba3633c3e828fb4d2d339
+Size (rustc-1.15.1/rustc-1.15.1-src.tar.gz) = 28100203 bytes
 SHA1 (patch-configure) = 229a8e8de52fc4f8a50380cc94066871a4ee83ab
-SHA1 (patch-mk_main.mk) = d95557691fb5711a142eee7663cda291cb3c9e80
-SHA1 (patch-mk_rustllvm.mk) = 054e370746e00180e063ddff94f5bef310d013fe
-SHA1 (patch-mk_target.mk) = ed84b0cdd8a665437b071d01fb3d4d66254af380
-SHA1 (patch-src_liblibc_src_unix_solaris_mod.rs) = 4fcc33b0750e41c0a53a4353d9b5c4c1107f7afc
-SHA1 (patch-src_librustc__back_target_x86__64__unknown__netbsd.rs) = 3b9fa892d4e2ac6bb43890a8964ad7373e055766
-SHA1 (patch-src_llvm_utils_buildit_build__llvm) = ec9bd4a28541a8cfd0a33cae2ae5d097116ac4de
+SHA1 (patch-src_bootstrap_native.rs) = ba543f26b31bd8b039a18e3ff13db3521ef010ee
+SHA1 (patch-src_libbacktrace_configure) = 2a985e27e64fd97f81f89524ab529eabd854d46b
+SHA1 (patch-src_libcompiler__builtins_build.rs) = 5b9b2dd3c41e8651a1f2eaf6317308519893a283
 SHA1 (patch-src_rust-installer_gen-install-script.sh) = 4b432b4c7d235f3e7f9b9ad06a2eef8e4ae82c14
-SHA1 (patch-src_rust-installer_gen-installer.sh) = b8177de36ed1d506a4a1ac8eb95148de9ed555b5
+SHA1 (patch-src_rust-installer_gen-installer.sh) = 60c77d618f6178317c5542806b11c999f05c33d9
 SHA1 (patch-src_rust-installer_install-template.sh) = b43d5b99c7472edfea7bab9ba2fd943aa49ac2e9
 SHA1 (patch-src_rust-installer_test.sh) = f9e201b2c6113a588d8216247e85b44b1372e50a
diff --git a/rustc/patches/patch-mk_main.mk b/rustc/patches/patch-mk_main.mk
deleted file mode 100644
index c9c0c9c152..0000000000
--- a/rustc/patches/patch-mk_main.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Use pkgsrc libLLVM.
-
---- mk/main.mk.orig	2016-06-30 23:21:42.000000000 +0000
-+++ mk/main.mk
-@@ -295,7 +295,7 @@ LLVM_REQUIRED_COMPONENTS=ipo bitreader b
- 
- ifneq ($(CFG_LLVM_ROOT),)
- # Ensure we only try to link targets that the installed LLVM actually has:
--LLVM_COMPONENTS := $(filter $(shell $(CFG_LLVM_ROOT)/bin/llvm-config$(X_$(CFG_BUILD)) --components),\
-+LLVM_COMPONENTS := $(filter $(shell $(CFG_LLVM_ROOT)/libexec/libLLVM/llvm-config$(X_$(CFG_BUILD)) --components),\
- 			$(LLVM_OPTIONAL_COMPONENTS)) $(LLVM_REQUIRED_COMPONENTS)
- else
- LLVM_COMPONENTS := $(LLVM_OPTIONAL_COMPONENTS) $(LLVM_REQUIRED_COMPONENTS)
-@@ -315,7 +315,7 @@ CFG_LLVM_INST_DIR_$(1):=$$(CFG_LLVM_ROOT
- endif
- 
- # Any rules that depend on LLVM should depend on LLVM_CONFIG
--LLVM_CONFIG_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-config$$(X_$(1))
-+LLVM_CONFIG_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/libexec/libLLVM/llvm-config$$(X_$(1))
- LLVM_MC_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-mc$$(X_$(1))
- LLVM_AR_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-ar$$(X_$(1))
- LLVM_VERSION_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --version)
diff --git a/rustc/patches/patch-mk_rustllvm.mk b/rustc/patches/patch-mk_rustllvm.mk
deleted file mode 100644
index 203a3ba43c..0000000000
--- a/rustc/patches/patch-mk_rustllvm.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Avoid double slashes, confuses cwrappers.
-
---- mk/rustllvm.mk.orig	2016-06-30 23:21:42.000000000 +0000
-+++ mk/rustllvm.mk
-@@ -50,10 +50,15 @@ RUSTLLVM_COMPONENTS_$(1) = $$(shell echo
- # start with a '/'. The shell we're running in will auto-translate the argument
- # `/foo` to `C:/msys64/foo` but we really want it to be passed through as `/foo`
- # so the argument passed to our shell must be `//foo`.
-+ifeq ($$(findstring msvc,$(1)),msvc)
-+SUBST_LLVM_CXXFLAGS_$(1) := $$(subst /,//,$$(LLVM_CXXFLAGS_$(1)))
-+else
-+SUBST_LLVM_CXXFLAGS_$(1) := $$(LLVM_CXXFLAGS_$(1))
-+endif
- $(1)/rustllvm/%.o: $(S)src/rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
- 	@$$(call E, compile: $$@)
- 	$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@,) \
--		$$(subst  /,//,$$(LLVM_CXXFLAGS_$(1))) \
-+		$$(SUBST_LLVM_CXXFLAGS_$(1)) \
- 		$$(RUSTLLVM_COMPONENTS_$(1)) \
- 		$$(EXTRA_RUSTLLVM_CXXFLAGS_$(1)) \
- 		$$(RUSTLLVM_INCS_$(1)) \
diff --git a/rustc/patches/patch-mk_target.mk b/rustc/patches/patch-mk_target.mk
deleted file mode 100644
index afa421106f..0000000000
--- a/rustc/patches/patch-mk_target.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Allow use of RUSTFLAGS$(STAGE)_$(CRATE) to be used here too, needed to
-sucessfully complete rustc.
-
---- mk/target.mk.orig	2016-07-04 18:04:09.000000000 +0000
-+++ mk/target.mk
-@@ -144,6 +144,7 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)
- 	@$$(call E, rustc: $$@)
- 	$$(STAGE$(1)_T_$(2)_H_$(3)) \
- 		$$(LLVM_LIBDIR_RUSTFLAGS_$(2)) \
-+		$$(RUSTFLAGS$(1)_$(4)) \
- 		-o $$@ $$< --cfg $(4)
- 
- endef
diff --git a/rustc/patches/patch-src_bootstrap_native.rs b/rustc/patches/patch-src_bootstrap_native.rs
new file mode 100644
index 0000000000..41b1528667
--- /dev/null
+++ b/rustc/patches/patch-src_bootstrap_native.rs
@@ -0,0 +1,14 @@
+$NetBSD$
+¯\(°_o)/¯
+
+--- src/bootstrap/native.rs.orig	2017-02-09 01:37:48.000000000 +0000
++++ src/bootstrap/native.rs
+@@ -124,6 +124,8 @@ pub fn llvm(build: &Build, target: &str)
+         cfg.define("CMAKE_CXX_FLAGS", build.cflags(target).join(" "));
+     }
+ 
++    cfg.define("CMAKE_INSTALL_RPATH", "");
++
+     // FIXME: we don't actually need to build all LLVM tools and all LLVM
+     //        libraries here, e.g. we just want a few components and a few
+     //        tools. Figure out how to filter them down and only build the right
diff --git a/rustc/patches/patch-src_libbacktrace_configure b/rustc/patches/patch-src_libbacktrace_configure
new file mode 100644
index 0000000000..8835ab7df3
--- /dev/null
+++ b/rustc/patches/patch-src_libbacktrace_configure
@@ -0,0 +1,13 @@
+$NetBSD$
+avoid undaignosed libtool breakage
+--- src/libbacktrace/configure.orig	2017-02-09 01:37:48.000000000 +0000
++++ src/libbacktrace/configure
+@@ -7783,7 +7783,7 @@ fi
+ LIBTOOL_DEPS="$ltmain"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='libtool'
+ 
+ 
+ 
diff --git a/rustc/patches/patch-src_libcompiler__builtins_build.rs b/rustc/patches/patch-src_libcompiler__builtins_build.rs
new file mode 100644
index 0000000000..9ff59d5f10
--- /dev/null
+++ b/rustc/patches/patch-src_libcompiler__builtins_build.rs
@@ -0,0 +1,14 @@
+$NetBSD$
+Don't build gcc_personality_v0.c on NetBSD.
+
+--- src/libcompiler_builtins/build.rs.orig	2017-02-09 01:37:48.000000000 +0000
++++ src/libcompiler_builtins/build.rs
+@@ -251,7 +251,7 @@ fn main() {
+             sources.extend(&["x86_64/floatdidf.c", "x86_64/floatdisf.c", "x86_64/floatdixf.c"]);
+         }
+     } else {
+-        if !target.contains("freebsd") {
++        if !target.contains("freebsd") && !target.contains("netbsd") {
+             sources.extend(&["gcc_personality_v0.c"]);
+         }
+ 
diff --git a/rustc/patches/patch-src_liblibc_src_unix_solaris_mod.rs b/rustc/patches/patch-src_liblibc_src_unix_solaris_mod.rs
deleted file mode 100644
index 35d675baf3..0000000000
--- a/rustc/patches/patch-src_liblibc_src_unix_solaris_mod.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Support SIGWINCH.
-
---- src/liblibc/src/unix/solaris/mod.rs.orig	2016-03-03 01:03:58.000000000 +0000
-+++ src/liblibc/src/unix/solaris/mod.rs
-@@ -372,6 +372,7 @@ pub const SIGSEGV: ::c_int = 11;
- pub const SIGPIPE: ::c_int = 13;
- pub const SIGALRM: ::c_int = 14;
- pub const SIGTERM: ::c_int = 15;
-+pub const SIGWINCH: ::c_int = 20;
- 
- pub const WNOHANG: ::c_int = 0x40;
- 
diff --git a/rustc/patches/patch-src_librustc__back_target_x86__64__unknown__netbsd.rs b/rustc/patches/patch-src_librustc__back_target_x86__64__unknown__netbsd.rs
deleted file mode 100644
index 8172f38b10..0000000000
--- a/rustc/patches/patch-src_librustc__back_target_x86__64__unknown__netbsd.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Apply upstream commit https://github.com/rust-lang/rust/commit/14b6c6d153edec5731230f919eaafcb5c32959d8
-addressing https://github.com/rust-lang/rust/issues/20777 to NetBSD too.
-
---- src/librustc_back/target/x86_64_unknown_netbsd.rs.orig	2016-07-04 18:04:09.000000000 +0000
-+++ src/librustc_back/target/x86_64_unknown_netbsd.rs
-@@ -12,6 +12,7 @@ use target::Target;
- 
- pub fn target() -> Target {
-     let mut base = super::netbsd_base::opts();
-+    base.cpu = "x86-64".to_string();
-     base.max_atomic_width = 64;
-     base.pre_link_args.push("-m64".to_string());
- 
diff --git a/rustc/patches/patch-src_llvm_utils_buildit_build__llvm b/rustc/patches/patch-src_llvm_utils_buildit_build__llvm
deleted file mode 100644
index faf07bcbd1..0000000000
--- a/rustc/patches/patch-src_llvm_utils_buildit_build__llvm
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix unportable test operator.
-
---- src/llvm/utils/buildit/build_llvm.orig	2016-05-23 16:30:08.000000000 +0000
-+++ src/llvm/utils/buildit/build_llvm
-@@ -227,7 +227,7 @@ cd $DIR/obj-llvm || exit 1
- 
- # Install the tree into the destination directory.
- make $JOBS_FLAG $COMMON_MAKEFLAGS UNIVERSAL_ARCH="$HOSTS" install
--if ! test $? == 0 ; then
-+if ! test $? = 0 ; then
-     echo "error: LLVM 'make install' failed!"
-     exit 1
- fi 
diff --git a/rustc/patches/patch-src_rust-installer_gen-installer.sh b/rustc/patches/patch-src_rust-installer_gen-installer.sh
index c5e9002103..1ab16a2d39 100644
--- a/rustc/patches/patch-src_rust-installer_gen-installer.sh
+++ b/rustc/patches/patch-src_rust-installer_gen-installer.sh
@@ -3,7 +3,7 @@ $NetBSD$
 Do not use /bin/echo, on e.g. SunOS it does not support -n.
 Avoid CDPATH issues.
 
---- src/rust-installer/gen-installer.sh.orig	2016-05-31 21:13:01.000000000 +0000
+--- src/rust-installer/gen-installer.sh.orig	2017-02-09 01:39:01.000000000 +0000
 +++ src/rust-installer/gen-installer.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh
@@ -11,16 +11,7 @@ Avoid CDPATH issues.
  # Copyright 2014 The Rust Project Developers. See the COPYRIGHT
  # file at the top-level directory of this distribution and at
  # http://rust-lang.org/COPYRIGHT.
-@@ -11,7 +11,7 @@
- 
- set -u
- 
--if [ -x /bin/echo ]; then
-+if [ -x /bin/donotuseecho ]; then
-     ECHO='/bin/echo'
- else
-     ECHO='echo'
-@@ -287,7 +287,7 @@ cp -r "$CFG_IMAGE_DIR/"* "$CFG_WORK_DIR/
+@@ -281,7 +281,7 @@ cp -r "$CFG_IMAGE_DIR/"* "$CFG_WORK_DIR/
  need_ok "couldn't copy source image"
  
  # Create the manifest
@@ -29,7 +20,7 @@ Avoid CDPATH issues.
  
  # Remove files in bulk dirs
  bulk_dirs=`echo "$CFG_BULK_DIRS" | tr "," " "`
-@@ -324,7 +324,7 @@ echo "$rust_installer_version" > "$versi
+@@ -317,7 +317,7 @@ echo "$rust_installer_version" > "$versi
  
  # Copy the overlay
  if [ -n "$CFG_NON_INSTALLED_OVERLAY" ]; then
Home | Main Index | Thread Index | Old Index