Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id F05867A21A for ; Thu, 23 Feb 2017 09:35:19 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 982358560F; Thu, 23 Feb 2017 09:35:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 27D2885607 for ; Thu, 23 Feb 2017 09:35:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id tZg2sAAEp0TG for ; Thu, 23 Feb 2017 09:35:17 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3562085582 for ; Thu, 23 Feb 2017 09:35:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2BEDFFBE4; Thu, 23 Feb 2017 09:35:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1487842517255420" MIME-Version: 1.0 Date: Thu, 23 Feb 2017 09:35:17 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/rust To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20170223093517.2BEDFFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1487842517255420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu Feb 23 09:35:17 UTC 2017 Modified Files: pkgsrc/lang/rust: Makefile PLIST buildlink3.mk distinfo pkgsrc/lang/rust/patches: patch-mk_rt.mk patch-mk_rustllvm.mk patch-src_etc_local__stage0.sh patch-src_librustc__trans_back_linker.rs patch-src_rust-installer_gen-install-script.sh patch-src_rust-installer_gen-installer.sh patch-src_rust-installer_install-template.sh Added Files: pkgsrc/lang/rust/patches: patch-mk_main.mk patch-src_grammar_check.sh patch-src_libcompiler__builtins_build.rs patch-src_libstd_sys_unix_os.rs Removed Files: pkgsrc/lang/rust/patches: patch-configure patch-src_liblibc_src_unix_solaris_mod.rs patch-src_libstd_sys_unix_thread.rs patch-src_llvm_Makefile.rules patch-src_llvm_utils_buildit_build__llvm Log Message: Update lang/rust to 1.15.1. Changes since 1.11.0 are too numerous to list, but can be found here: https://github.com/rust-lang/rust/blob/master/RELEASES.md Add a stage0-bootstrap target to simplify generation of bootstrap kits for platforms which are not supported upstream (primarily SmartOS). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/rust/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/rust/PLIST \ pkgsrc/lang/rust/buildlink3.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/rust/distinfo cvs rdiff -u -r1.1 -r0 pkgsrc/lang/rust/patches/patch-configure \ pkgsrc/lang/rust/patches/patch-src_liblibc_src_unix_solaris_mod.rs \ pkgsrc/lang/rust/patches/patch-src_libstd_sys_unix_thread.rs \ pkgsrc/lang/rust/patches/patch-src_llvm_Makefile.rules \ pkgsrc/lang/rust/patches/patch-src_llvm_utils_buildit_build__llvm cvs rdiff -u -r0 -r1.1 pkgsrc/lang/rust/patches/patch-mk_main.mk \ pkgsrc/lang/rust/patches/patch-src_grammar_check.sh \ pkgsrc/lang/rust/patches/patch-src_libcompiler__builtins_build.rs \ pkgsrc/lang/rust/patches/patch-src_libstd_sys_unix_os.rs cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/rust/patches/patch-mk_rt.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/rust/patches/patch-mk_rustllvm.mk \ pkgsrc/lang/rust/patches/patch-src_librustc__trans_back_linker.rs \ pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-install-script.sh \ pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-installer.sh \ pkgsrc/lang/rust/patches/patch-src_rust-installer_install-template.sh cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/lang/rust/patches/patch-src_etc_local__stage0.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1487842517255420 Content-Disposition: inline Content-Length: 32527 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/rust/Makefile diff -u pkgsrc/lang/rust/Makefile:1.5 pkgsrc/lang/rust/Makefile:1.6 --- pkgsrc/lang/rust/Makefile:1.5 Mon Nov 14 20:56:10 2016 +++ pkgsrc/lang/rust/Makefile Thu Feb 23 09:35:16 2017 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2016/11/14 20:56:10 ryoon Exp $ +# $NetBSD: Makefile,v 1.6 2017/02/23 09:35:16 jperkin Exp $ -DISTNAME= rustc-1.11.0-src +DISTNAME= rustc-1.15.1-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} -PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/ @@ -11,8 +10,6 @@ HOMEPAGE= http://www.rust-lang.org/ COMMENT= Safe, concurrent, practical language LICENSE= mit OR apache-2.0 -WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} - USE_GCC_RUNTIME= yes USE_LANGUAGES= c c++ USE_TOOLS+= bash gmake @@ -24,6 +21,13 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PK CONFIGURE_ARGS+= --release-channel=stable CONFIGURE_ENV+= CFG_DISABLE_CODEGEN_TESTS=1 +# +# Use the Makefile-based build system. Unfortunately this will be going away, +# likely in the next release, forcing us to use a cargo-based system which will +# require further binary bootstraps. Hold out as long as we can. +# +CONFIGURE_ARGS+= --disable-rustbuild + UNLIMIT_RESOURCES+= cputime REPLACE_BASH+= src/rust-installer/gen-install-script.sh @@ -70,42 +74,50 @@ CONFIGURE_ARGS+= --llvm-root=${BUILDLINK # # Rust unfortunately requires itself to build. On platforms which aren't -# supported by upstream (where they offer binary bootstraps), or where we -# do not trust random binaries from the Internet, we need to build and -# provide our own bootstrap. -# -# pkgsrc can be used to do this, but the resulting bootstrap must be -# relocatable (i.e. $ORIGIN) and not depend on anything from pkgsrc (so it -# is common to use rust's internal llvm). -# -# The following variables need to be modified/commented out when producing -# a stage2 bootstrap. +# supported by upstream (where they offer binary bootstraps), or where we do +# not trust random binaries from the Internet, we need to build and provide our +# own bootstrap. See the stage0-bootstrap below for more details. # CONFIGURE_ARGS+= --enable-local-rust -CONFIGURE_ARGS+= --local-rust-root=${WRKDIR}/rust-${RUST_STAGE2_VER}-${RUST_ARCH}/rustc +CONFIGURE_ARGS+= --local-rust-root=${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/rustc # -.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) -RUST_ARCH= i686-apple-darwin -.elif !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) -RUST_ARCH= x86_64-apple-darwin -.elif !empty(MACHINE_PLATFORM:MLinux-*-i386) -RUST_ARCH= i686-unknown-linux-gnu -.elif !empty(MACHINE_PLATFORM:MLinux-*-x86_64) -RUST_ARCH= x86_64-unknown-linux-gnu -.elif !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) -RUST_ARCH= x86_64-sun-solaris -SITES.${RUST_STAGE2}= https://us-east.manta.joyent.com/pkgsrc/public/tmp/ -.elif !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) +DISTFILES:= ${DEFAULT_DISTFILES} +RUST_STAGE0_VER= 1.14.0 +# +.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make (makesum) || make(mdi) +RUST_ARCH:= i686-apple-darwin +RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz +DISTFILES:= ${DISTFILES} ${RUST_STAGE0} +.endif +.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) +RUST_ARCH:= x86_64-apple-darwin +RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz +DISTFILES:= ${DISTFILES} ${RUST_STAGE0} +.endif +.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi) +RUST_ARCH:= i686-unknown-linux-gnu +RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz +DISTFILES:= ${DISTFILES} ${RUST_STAGE0} +.endif +.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) +RUST_ARCH:= x86_64-unknown-linux-gnu +RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz +DISTFILES:= ${DISTFILES} ${RUST_STAGE0} +.endif +.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) +RUST_ARCH:= x86_64-sun-solaris +RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz +SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/ +DISTFILES:= ${DISTFILES} ${RUST_STAGE0} +.endif +.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) RUST_ARCH= x86_64-unknown-netbsd -.else -NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM} +RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz +DISTFILES:= ${DISTFILES} ${RUST_STAGE0} .endif -.if defined(RUST_ARCH) -RUST_STAGE2_VER= 1.10.0 -RUST_STAGE2?= rust-${RUST_STAGE2_VER}-${RUST_ARCH}.tar.gz -SITES.${RUST_STAGE2}?= https://static.rust-lang.org/dist/ -DISTFILES= ${DEFAULT_DISTFILES} ${RUST_STAGE2} +.if !defined(RUST_ARCH) +NOT_FOR_PLATFORM+= ${MACHINE_PLATFORM} .endif PLIST_SRC= PLIST @@ -119,7 +131,7 @@ OPSYSVARS+= SOEXT SOEXT.Darwin= dylib SOEXT.*= so -RUST_VERHASH= 39b92f95 +RUST_VERHASH= 570da8f8 PLIST_SUBST+= RUST_ARCH=${RUST_ARCH:Q} PLIST_SUBST+= RUST_VERHASH=${RUST_VERHASH:Q} PLIST_SUBST+= SOEXT=${SOEXT:Q} @@ -168,6 +180,35 @@ fix-darwin-install-name: . endfor .endif +# +# Create a relocatable stage2 bootstrap from the bits we just built that can be +# used to build the next version of rust. Currently only tested on SmartOS. +# +BOOTSTRAP_TMPDIR= ${WRKDIR}/${PKGNAME}-${RUST_ARCH}/rustc +USE_TOOLS+= gtar + +stage0-bootstrap: install + ${MKDIR} ${BOOTSTRAP_TMPDIR} + ${CP} -R ${DESTDIR}/${PREFIX}/bin ${BOOTSTRAP_TMPDIR}/ + ${CP} -R ${DESTDIR}/${PREFIX}/lib ${BOOTSTRAP_TMPDIR}/ +.if ${OS_VARIANT} == "SmartOS" + for lib in libgcc_s.so.1 libssp.so.0 libstdc++.so.6; do \ + ${CP} `${PKG_CC} -print-file-name=$${lib}` \ + ${BOOTSTRAP_TMPDIR}/lib/; \ + done + for f in ${BOOTSTRAP_TMPDIR}/bin/rust{c,doc}; do \ + /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN/../lib' $$f; \ + done + for f in ${BOOTSTRAP_TMPDIR}/lib/*.so*; do \ + /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN' $$f; \ + done + for f in ${BOOTSTRAP_TMPDIR}/lib/rustlib/${RUST_ARCH}/lib/*.so*; do \ + /usr/bin/elfedit -e 'dyn:runpath $$ORIGIN:$$ORIGIN/../../..' $$f; \ + done +.endif + (cd ${WRKDIR}; \ + ${GTAR} -zcf ${PKGNAME}-${RUST_ARCH}.tar.gz ${PKGNAME}-${RUST_ARCH}) + .include "../../devel/cmake/buildlink3.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/lang/rust/PLIST diff -u pkgsrc/lang/rust/PLIST:1.1 pkgsrc/lang/rust/PLIST:1.2 --- pkgsrc/lang/rust/PLIST:1.1 Tue Sep 6 10:36:49 2016 +++ pkgsrc/lang/rust/PLIST Thu Feb 23 09:35:16 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2016/09/06 10:36:49 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.2 2017/02/23 09:35:16 jperkin Exp $ bin/rustc bin/rustdoc lib/libarena-${RUST_VERHASH}.${SOEXT} @@ -7,7 +7,9 @@ lib/libfmt_macros-${RUST_VERHASH}.${SOEX lib/libgetopts-${RUST_VERHASH}.${SOEXT} lib/libgraphviz-${RUST_VERHASH}.${SOEXT} lib/liblog-${RUST_VERHASH}.${SOEXT} -lib/librbml-${RUST_VERHASH}.${SOEXT} +lib/libproc_macro-${RUST_VERHASH}.${SOEXT} +lib/libproc_macro_plugin-${RUST_VERHASH}.${SOEXT} +lib/libproc_macro_tokens-${RUST_VERHASH}.${SOEXT} lib/librustc-${RUST_VERHASH}.${SOEXT} lib/librustc_back-${RUST_VERHASH}.${SOEXT} lib/librustc_borrowck-${RUST_VERHASH}.${SOEXT} @@ -48,7 +50,7 @@ ${PLIST.jemalloc}lib/rustlib/${RUST_ARCH 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/libcompiler_builtins-${RUST_VERHASH}.rlib 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} @@ -59,8 +61,10 @@ lib/rustlib/${RUST_ARCH}/lib/liblibc-${R 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/libproc_macro-${RUST_VERHASH}.${SOEXT} +lib/rustlib/${RUST_ARCH}/lib/libproc_macro_plugin-${RUST_VERHASH}.${SOEXT} +lib/rustlib/${RUST_ARCH}/lib/libproc_macro_tokens-${RUST_VERHASH}.${SOEXT} 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 @@ -83,11 +87,11 @@ lib/rustlib/${RUST_ARCH}/lib/librustc_re 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/libstd-${RUST_VERHASH}.rlib +lib/rustlib/${RUST_ARCH}/lib/libstd_unicode-${RUST_VERHASH}.rlib lib/rustlib/${RUST_ARCH}/lib/libsyntax-${RUST_VERHASH}.${SOEXT} lib/rustlib/${RUST_ARCH}/lib/libsyntax_ext-${RUST_VERHASH}.${SOEXT} lib/rustlib/${RUST_ARCH}/lib/libsyntax_pos-${RUST_VERHASH}.${SOEXT} Index: pkgsrc/lang/rust/buildlink3.mk diff -u pkgsrc/lang/rust/buildlink3.mk:1.1 pkgsrc/lang/rust/buildlink3.mk:1.2 --- pkgsrc/lang/rust/buildlink3.mk:1.1 Tue Sep 6 10:36:49 2016 +++ pkgsrc/lang/rust/buildlink3.mk Thu Feb 23 09:35:16 2017 @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/09/06 10:36:49 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2017/02/23 09:35:16 jperkin Exp $ BUILDLINK_TREE+= rust .if !defined(RUST_BUILDLINK3_MK) RUST_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.rust+= rust>=0.11.0 +BUILDLINK_API_DEPENDS.rust+= rust>=1.15.1 BUILDLINK_PKGSRCDIR.rust?= ../../lang/rust BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/lib/rustlib Index: pkgsrc/lang/rust/distinfo diff -u pkgsrc/lang/rust/distinfo:1.4 pkgsrc/lang/rust/distinfo:1.5 --- pkgsrc/lang/rust/distinfo:1.4 Sun Jan 8 14:38:13 2017 +++ pkgsrc/lang/rust/distinfo Thu Feb 23 09:35:16 2017 @@ -1,43 +1,46 @@ -$NetBSD: distinfo,v 1.4 2017/01/08 14:38:13 maya Exp $ +$NetBSD: distinfo,v 1.5 2017/02/23 09:35:16 jperkin Exp $ -SHA1 (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = aded64d8ddc5d286ffc81de21c6a8c47951ac329 -RMD160 (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = 9248526a5f9656e083a221f0931f9cec6b1a0726 -SHA512 (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = ef1e874aadc24a64e7df0a09dfea0e5ed6a0bf7acbaf8485976c602f549141289c07b2e27cd7d0a0029f9884042d6ff00c8b917543a9284bae7f7c684ddc6904 -Size (rust-1.10.0-i686-unknown-linux-gnu.tar.gz) = 119011780 bytes -SHA1 (rust-1.10.0-x86_64-unknown-netbsd.tar.gz) = eb84816dd0fb113fbddd75fd8c451ae67a8ab454 -RMD160 (rust-1.10.0-x86_64-unknown-netbsd.tar.gz) = e13b58f2da1b6cbdeceeb3f1cccdc5c5b9a01c78 -SHA512 (rust-1.10.0-x86_64-unknown-netbsd.tar.gz) = ffa251dcc5afc6d40920c333c74ecfe3e3eb3fae3c984b7715c260fdb11a4580e61097ba32bd02147c42b3b78e7f2be6a3902bb89fa55befb59d1c71c66d1cf3 -Size (rust-1.10.0-x86_64-unknown-netbsd.tar.gz) = 123531094 bytes -SHA1 (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 9d88b5a1203f91ac12a2f3d33944d6dbeabf3347 -RMD160 (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 046553af4b914421d2ddcde64b6025f18f610bf5 -SHA512 (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 428c53bd402094254e16b5b29303ce5565abf11275546aaa7fecf4f6ea2b13ec46a7d455b1e9c2a6f50a0fcd5573c10adcef09afd29dc390202fa152c31400ac -Size (rust-1.10.0-x86_64-apple-darwin.tar.gz) = 107969649 bytes -SHA1 (rust-1.10.0-x86_64-sun-solaris.tar.gz) = 3bbd80ac1609fe60da890ae90c4d08acb5ca77cb -RMD160 (rust-1.10.0-x86_64-sun-solaris.tar.gz) = df0208b8bbcbcc8e7d4e3497cb5191a418b40b03 -SHA512 (rust-1.10.0-x86_64-sun-solaris.tar.gz) = 73e5e0bdf072910b280abc1ff2dc71fa3ee1808c4a41a387c9cb5f9a69a00aaea3aa1c31ae167ad60d2a5a8730943d0c8c4c5e902e671250d3398541e80ff7fa -Size (rust-1.10.0-x86_64-sun-solaris.tar.gz) = 222992235 bytes -SHA1 (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = 1174c1e9e6d1de47715ecb611bf917938b8be5e9 -RMD160 (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = 72878c0b697ae049919cb04b37d42cf26256f7cd -SHA512 (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = ffcef849222a57e56e2d21e01134a45265e3f5d03d3042bf8492e54007664e9c290275cb7ffb0ff4d1b1c09e222bcd0946284390886e942aa0f53862b73fb8f2 -Size (rust-1.10.0-x86_64-unknown-linux-gnu.tar.gz) = 118275404 bytes -SHA1 (rustc-1.11.0-src.tar.gz) = d4c7177fd939be64c08b6460d89a1595b24406b4 -RMD160 (rustc-1.11.0-src.tar.gz) = ada0761c38febb423677c1b8bb2fd5c8fee05d53 -SHA512 (rustc-1.11.0-src.tar.gz) = 6ad050a02e3a3b48f205f5d5ed9393fd2a1a2237e5c78b3e51af8162f410b93a831ebe5980ce78c4d38c5a692395c7fec8442956497a5d21e9f7157404c6b5aa -Size (rustc-1.11.0-src.tar.gz) = 26126471 bytes -SHA1 (patch-configure) = df5fb89bb04be3844fba78e0adea5c0a2901e376 +SHA1 (rust-1.14.0-i686-apple-darwin.tar.gz) = 1dbe90d332dbbf64bc61b2ee7398665606a0f52f +RMD160 (rust-1.14.0-i686-apple-darwin.tar.gz) = 1507a4a3006740f17722a0ccfad1fa286eebf4ab +SHA512 (rust-1.14.0-i686-apple-darwin.tar.gz) = 1840124b13c75d8a95fb3058dc68d5bbcdc315dd0c256c4445b089790d3ba8dd20f58d042a14ade49219e66b45f330f9c8a919da3d756874bf225fbe523635f7 +Size (rust-1.14.0-i686-apple-darwin.tar.gz) = 86855764 bytes +SHA1 (rust-1.14.0-i686-unknown-linux-gnu.tar.gz) = 2857127fa653e2a5712d4a1b35c824fd9b7c6945 +RMD160 (rust-1.14.0-i686-unknown-linux-gnu.tar.gz) = ff92a10465edf5ad4e0d9a731548529e83408190 +SHA512 (rust-1.14.0-i686-unknown-linux-gnu.tar.gz) = 2e1cd7cb1c9a1c147fcfe16f5eac3876b88a5a04bc1a6d2386756181986046b8636c317fb76834ca75aec99f0bcf9e5ce760eacf74b4b9811210db4a59fdb66f +Size (rust-1.14.0-i686-unknown-linux-gnu.tar.gz) = 126452488 bytes +SHA1 (rust-1.14.0-x86_64-apple-darwin.tar.gz) = 2d38e71957a498d983ae3380a150506296e3f0ab +RMD160 (rust-1.14.0-x86_64-apple-darwin.tar.gz) = 1be43dd12f53937df4d6b9ec82304118283bb590 +SHA512 (rust-1.14.0-x86_64-apple-darwin.tar.gz) = 669060b402309fae67bc96a4dbb00e9aad78a0f161bf6efa279b47849a6b33bf7c25580fa7c35db6578ab1fd3fcff554b21b9b468f9aa6e02da86e57cd30f504 +Size (rust-1.14.0-x86_64-apple-darwin.tar.gz) = 87627970 bytes +SHA1 (rust-1.14.0-x86_64-sun-solaris.tar.gz) = c4766837f468ea43d38c6c75c162ddb30f4e1acf +RMD160 (rust-1.14.0-x86_64-sun-solaris.tar.gz) = 190ff54c26f2a604eaf9ddeb3f1ae5983ec91f06 +SHA512 (rust-1.14.0-x86_64-sun-solaris.tar.gz) = adda98dced9976ae15b05c2fc468896bff14bc5f6519ede440222a279546deb666ace8543ba5cd673e52cb419984c98de2eec505bae04ccec65fde8d9dd7ba75 +Size (rust-1.14.0-x86_64-sun-solaris.tar.gz) = 146691551 bytes +SHA1 (rust-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 13400413f8b3a950f33aec953b2e016f3aa6c9fc +RMD160 (rust-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = d6b128acb91641c18c62ef6fde94484d49fc53d7 +SHA512 (rust-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 6ec7155a2ac95718d1c28ffada0d365ca46cca7b1879b4533a662a4e63140fd2a70a9647a4b4d57e12d0d20dd46b7aba18365db0ed0cfd870b0a0394d4266b8c +Size (rust-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 122820395 bytes +SHA1 (rust-1.14.0-x86_64-unknown-netbsd.tar.gz) = 2c109b36718dae3dde024a8735b5a9424dec0244 +RMD160 (rust-1.14.0-x86_64-unknown-netbsd.tar.gz) = e7141f0976b1ad8afca0d0b49008307695bd7137 +SHA512 (rust-1.14.0-x86_64-unknown-netbsd.tar.gz) = 048d8b31fafb4a54d5d666e690967619453a5fe35d5db0167fd5e429025a43dee509a0b6dab4fc8b29a2373f938a504f2515bef56f69742d7f09d84352728ece +Size (rust-1.14.0-x86_64-unknown-netbsd.tar.gz) = 127088664 bytes +SHA1 (rustc-1.15.1-src.tar.gz) = a5f4b21eeb0fb8ff0e156883aca16759ffb45f05 +RMD160 (rustc-1.15.1-src.tar.gz) = d98f20326938e780e016d08425dbc7f314d3e7c8 +SHA512 (rustc-1.15.1-src.tar.gz) = 10d533b17cf7f92b9dff14b399b5dd0ac8b68284eea072c85ede78a4e4c2c4fce8c781777124c64798057aceb6444535e02e067fd67ba3633c3e828fb4d2d339 +Size (rustc-1.15.1-src.tar.gz) = 28100203 bytes SHA1 (patch-mk_cfg_x86__64-apple-darwin.mk) = 37b50b64ea5607588d541852e07f02a4611d38c8 -SHA1 (patch-mk_rt.mk) = 51238ae320b47296546537aeb050773511049d11 -SHA1 (patch-mk_rustllvm.mk) = 500ce129d9ea83fc97317679b45a79f12c8ca9e8 +SHA1 (patch-mk_main.mk) = d821a86920e563618d00d5428d6dd9056d7c7fdb +SHA1 (patch-mk_rt.mk) = d98d1cd2f87d25c0be4e8709bac33f15c7e924e6 +SHA1 (patch-mk_rustllvm.mk) = 285fb33ce5477d18914289323c0e2db16cc7ccae SHA1 (patch-src_compiler-rt_lib_builtins_CMakeLists.txt) = 288870c40b5e4ce29cbfb19cc9f56d35152c47fa -SHA1 (patch-src_etc_local__stage0.sh) = 965e53e0522c0bdcb0a3976af7b8ac53635502f1 -SHA1 (patch-src_liblibc_src_unix_solaris_mod.rs) = 7279fb49054d203b045327a5b9c52b2fbdc2c8d6 -SHA1 (patch-src_librustc__trans_back_linker.rs) = 279850f534bed6380bbc3ffd47e49938fa6423df +SHA1 (patch-src_etc_local__stage0.sh) = 31c7eb5fdb5eae61132c8e46998a15b5e5ea7015 +SHA1 (patch-src_grammar_check.sh) = 6958b994da4b04b74cb2d25f026932a19cd80b8a +SHA1 (patch-src_libcompiler__builtins_build.rs) = 5a57625071a3422e79c7e5a69426aeedd1512633 +SHA1 (patch-src_librustc__trans_back_linker.rs) = 4fee3a23665ebc192b249112faf6e85f4cfacd13 SHA1 (patch-src_libstd_rtdeps.rs) = ed271c5b83a8d623469abd39a2d072bfffbcc890 -SHA1 (patch-src_libstd_sys_unix_thread.rs) = 03ea5a505427faeaf66a58cb2134ac651daf3fb5 -SHA1 (patch-src_llvm_Makefile.rules) = c5f76ef8ee1fc283d2feb7dc388c7938a81c8849 +SHA1 (patch-src_libstd_sys_unix_os.rs) = 72eec2cc3d44445dd2636e7c46c9b4a0cf888f88 SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = 282d97cce8d01cfefe565185d4999c2db9ccc13f SHA1 (patch-src_llvm_lib_CodeGen_MachineDominanceFrontier.cpp) = 2899771b1a23be840b9305eff7e5e5f957239ccb -SHA1 (patch-src_llvm_utils_buildit_build__llvm) = bc2c729153f3eee77ff3f018364544b947bab9d0 -SHA1 (patch-src_rust-installer_gen-install-script.sh) = 689ff4e8fa3ee9cd41202b40b6575f568eef6415 -SHA1 (patch-src_rust-installer_gen-installer.sh) = 43087b7471bfb9b0bcbd7c94cc0de22b2dd2f757 -SHA1 (patch-src_rust-installer_install-template.sh) = 85be7f5a0706c3d3fa9078458555723e797a7c5e +SHA1 (patch-src_rust-installer_gen-install-script.sh) = 1b1e9c0ab6e9395b4138dcc15a385952a1138158 +SHA1 (patch-src_rust-installer_gen-installer.sh) = 024b888ae40ecdadb4f3a8fa7865fba0a0590a5b +SHA1 (patch-src_rust-installer_install-template.sh) = d42b6d55fdbb8640cee75588a230efb3c2641e32 Index: pkgsrc/lang/rust/patches/patch-mk_rt.mk diff -u pkgsrc/lang/rust/patches/patch-mk_rt.mk:1.2 pkgsrc/lang/rust/patches/patch-mk_rt.mk:1.3 --- pkgsrc/lang/rust/patches/patch-mk_rt.mk:1.2 Mon Sep 12 13:27:33 2016 +++ pkgsrc/lang/rust/patches/patch-mk_rt.mk Thu Feb 23 09:35:16 2017 @@ -1,23 +1,18 @@ -$NetBSD: patch-mk_rt.mk,v 1.2 2016/09/12 13:27:33 ryoon Exp $ +$NetBSD: patch-mk_rt.mk,v 1.3 2017/02/23 09:35:16 jperkin Exp $ -Fix library location on SunOS. +Don't build gcc_personality_v0.o on NetBSD. ---- mk/rt.mk.orig 2016-08-16 01:54:35.000000000 +0000 +--- mk/rt.mk.orig 2017-02-09 01:37:48.000000000 +0000 +++ mk/rt.mk -@@ -269,6 +269,16 @@ endif - COMPRT_DEFINES_$(1) := -DCOMPILER_RT_ENABLE_IOS=ON - endif +@@ -552,9 +552,11 @@ endif + ifeq ($$(findstring msvc,$(1)),) -+ifeq ($$(findstring solaris,$(1)),solaris) -+COMPRT_DIR_$(1) := sunos -+COMPRT_LIB_NAME_$(1) := clang_rt.builtins-$$(COMPRT_ARCH_$(1)) -+endif -+ -+ifeq ($$(findstring netbsd,$(1)),netbsd) -+COMPRT_DIR_$(1) := netbsd -+COMPRT_LIB_NAME_$(1) := clang_rt.builtins-$$(COMPRT_ARCH_$(1)) + ifeq ($$(findstring freebsd,$(1)),) ++ifeq ($$(findstring netbsd,$(1)),) + $(call ADD_INTRINSIC,$(1),gcc_personality_v0.o) + endif + endif +endif -+ - ifndef COMPRT_DIR_$(1) - # NB: FreeBSD and NetBSD output to "linux"... - COMPRT_DIR_$(1) := linux + + ifeq ($$(findstring aarch64,$(1)),aarch64) + $(foreach intrinsic,comparetf2.o \ Index: pkgsrc/lang/rust/patches/patch-mk_rustllvm.mk diff -u pkgsrc/lang/rust/patches/patch-mk_rustllvm.mk:1.1 pkgsrc/lang/rust/patches/patch-mk_rustllvm.mk:1.2 --- pkgsrc/lang/rust/patches/patch-mk_rustllvm.mk:1.1 Tue Sep 6 10:36:49 2016 +++ pkgsrc/lang/rust/patches/patch-mk_rustllvm.mk Thu Feb 23 09:35:16 2017 @@ -1,8 +1,8 @@ -$NetBSD: patch-mk_rustllvm.mk,v 1.1 2016/09/06 10:36:49 jperkin Exp $ +$NetBSD: patch-mk_rustllvm.mk,v 1.2 2017/02/23 09:35:16 jperkin Exp $ Ensure we can find generated LLVM includes. ---- mk/rustllvm.mk.orig 2016-07-04 18:04:09.000000000 +0000 +--- mk/rustllvm.mk.orig 2016-09-27 07:17:04.000000000 +0000 +++ mk/rustllvm.mk @@ -17,11 +17,9 @@ define DEF_RUSTLLVM_TARGETS # FIXME: Lately, on windows, llvm-config --includedir is not enough @@ -15,4 +15,4 @@ Ensure we can find generated LLVM includ -endif RUSTLLVM_OBJS_CS_$(1) := $$(addprefix rustllvm/, \ - ExecutionEngineWrapper.cpp RustWrapper.cpp PassWrapper.cpp \ + RustWrapper.cpp PassWrapper.cpp \ Index: pkgsrc/lang/rust/patches/patch-src_librustc__trans_back_linker.rs diff -u pkgsrc/lang/rust/patches/patch-src_librustc__trans_back_linker.rs:1.1 pkgsrc/lang/rust/patches/patch-src_librustc__trans_back_linker.rs:1.2 --- pkgsrc/lang/rust/patches/patch-src_librustc__trans_back_linker.rs:1.1 Tue Sep 6 10:36:49 2016 +++ pkgsrc/lang/rust/patches/patch-src_librustc__trans_back_linker.rs Thu Feb 23 09:35:16 2017 @@ -1,13 +1,13 @@ -$NetBSD: patch-src_librustc__trans_back_linker.rs,v 1.1 2016/09/06 10:36:49 jperkin Exp $ +$NetBSD: patch-src_librustc__trans_back_linker.rs,v 1.2 2017/02/23 09:35:16 jperkin Exp $ Permit post-install install_name_tool fixup. ---- src/librustc_trans/back/linker.rs.orig 2016-08-16 01:54:35.000000000 +0000 +--- src/librustc_trans/back/linker.rs.orig 2017-02-09 01:37:48.000000000 +0000 +++ src/librustc_trans/back/linker.rs -@@ -206,6 +206,8 @@ impl<'a> Linker for GnuLinker<'a> { - self.cmd.args(&["-dynamiclib", "-Wl,-dylib"]); - - if self.sess.opts.cg.rpath { +@@ -213,6 +213,8 @@ impl<'a> Linker for GnuLinker<'a> { + // the right `-Wl,-install_name` with an `@rpath` in it. + if self.sess.opts.cg.rpath || + self.sess.opts.debugging_opts.osx_rpath_install_name { + // Ensure we can use install_name_tool later to fixup. + self.cmd.arg("-Wl,-headerpad_max_install_names"); let mut v = OsString::from("-Wl,-install_name,@rpath/"); Index: pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-install-script.sh diff -u pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-install-script.sh:1.1 pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-install-script.sh:1.2 --- pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-install-script.sh:1.1 Tue Sep 6 10:36:49 2016 +++ pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-install-script.sh Thu Feb 23 09:35:16 2017 @@ -1,15 +1,9 @@ -$NetBSD: patch-src_rust-installer_gen-install-script.sh,v 1.1 2016/09/06 10:36:49 jperkin Exp $ +$NetBSD: patch-src_rust-installer_gen-install-script.sh,v 1.2 2017/02/23 09:35:16 jperkin Exp $ Do not use /bin/echo, not guaranteed to support -n. --- src/rust-installer/gen-install-script.sh.orig 2016-07-04 18:05:18.000000000 +0000 +++ src/rust-installer/gen-install-script.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # 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 Index: pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-installer.sh diff -u pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-installer.sh:1.1 pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-installer.sh:1.2 --- pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-installer.sh:1.1 Tue Sep 6 10:36:49 2016 +++ pkgsrc/lang/rust/patches/patch-src_rust-installer_gen-installer.sh Thu Feb 23 09:35:16 2017 @@ -1,26 +1,11 @@ -$NetBSD: patch-src_rust-installer_gen-installer.sh,v 1.1 2016/09/06 10:36:49 jperkin Exp $ +$NetBSD: patch-src_rust-installer_gen-installer.sh,v 1.2 2017/02/23 09:35:16 jperkin Exp $ Do not use /bin/echo, not guaranteed to support -n. Unset CDPATH before printing cd output. ---- src/rust-installer/gen-installer.sh.orig 2016-07-04 18:05:18.000000000 +0000 +--- src/rust-installer/gen-installer.sh.orig 2016-09-27 07:18:21.000000000 +0000 +++ src/rust-installer/gen-installer.sh -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # 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 +14,7 @@ Unset CDPATH before printing cd output. # 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 Index: pkgsrc/lang/rust/patches/patch-src_rust-installer_install-template.sh diff -u pkgsrc/lang/rust/patches/patch-src_rust-installer_install-template.sh:1.1 pkgsrc/lang/rust/patches/patch-src_rust-installer_install-template.sh:1.2 --- pkgsrc/lang/rust/patches/patch-src_rust-installer_install-template.sh:1.1 Tue Sep 6 10:36:49 2016 +++ pkgsrc/lang/rust/patches/patch-src_rust-installer_install-template.sh Thu Feb 23 09:35:16 2017 @@ -1,9 +1,9 @@ -$NetBSD: patch-src_rust-installer_install-template.sh,v 1.1 2016/09/06 10:36:49 jperkin Exp $ +$NetBSD: patch-src_rust-installer_install-template.sh,v 1.2 2017/02/23 09:35:16 jperkin Exp $ Support SunOS. Fix undefined variable warnings. ---- src/rust-installer/install-template.sh.orig 2016-07-04 18:05:18.000000000 +0000 +--- src/rust-installer/install-template.sh.orig 2016-09-27 07:18:21.000000000 +0000 +++ src/rust-installer/install-template.sh @@ -352,6 +352,10 @@ get_host_triple() { _ostype=apple-darwin @@ -16,12 +16,3 @@ Fix undefined variable warnings. MINGW*) _ostype=pc-windows-gnu ;; -@@ -381,7 +385,7 @@ get_host_triple() { - ;; - - *) -- err "unknown value from uname -s: $uname_value" -+ err "unknown value from uname -s: $_uname_value" - ;; - esac - Index: pkgsrc/lang/rust/patches/patch-src_etc_local__stage0.sh diff -u pkgsrc/lang/rust/patches/patch-src_etc_local__stage0.sh:1.3 pkgsrc/lang/rust/patches/patch-src_etc_local__stage0.sh:1.4 --- pkgsrc/lang/rust/patches/patch-src_etc_local__stage0.sh:1.3 Tue Sep 13 12:37:08 2016 +++ pkgsrc/lang/rust/patches/patch-src_etc_local__stage0.sh Thu Feb 23 09:35:16 2017 @@ -1,31 +1,23 @@ -$NetBSD: patch-src_etc_local__stage0.sh,v 1.3 2016/09/13 12:37:08 ryoon Exp $ +$NetBSD: patch-src_etc_local__stage0.sh,v 1.4 2017/02/23 09:35:16 jperkin Exp $ -Copy additional libarena required on Darwin. -Copy GCC support libraries required on SunOS. ---- src/etc/local_stage0.sh.orig 2016-08-16 01:54:35.000000000 +0000 +--- src/etc/local_stage0.sh.orig 2016-12-20 23:34:55.000000000 +0000 +++ src/etc/local_stage0.sh @@ -18,7 +18,7 @@ LIB_PREFIX=lib OS=`uname -s` case $OS in -- ("Linux"|"FreeBSD"|"DragonFly"|"Bitrig"|"OpenBSD"|"SunOS") -+ ("Linux"|"FreeBSD"|"DragonFly"|"Bitrig"|"OpenBSD"|"SunOS"|"NetBSD") +- ("Linux"|"FreeBSD"|"DragonFly"|"Bitrig"|"OpenBSD"|"SunOS"|"Haiku") ++ ("Linux"|"FreeBSD"|"DragonFly"|"Bitrig"|"OpenBSD"|"SunOS"|"Haiku"|"NetBSD") BIN_SUF= LIB_SUF=.so ;; -@@ -51,6 +51,7 @@ fi - - cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ - cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ -+cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}arena*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ - cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ - cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ - cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -@@ -63,6 +64,9 @@ cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}log - cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rbml*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +@@ -72,6 +72,9 @@ cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rbm cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}serialize*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}term*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ + cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}proc_macro*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}gcc_s*${LIB_SUF}* ${TARG_DIR}/stage0/${LIB_DIR}/ +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}ssp*${LIB_SUF}* ${TARG_DIR}/stage0/${LIB_DIR}/ +cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}stdc++*${LIB_SUF}* ${TARG_DIR}/stage0/${LIB_DIR}/ Added files: Index: pkgsrc/lang/rust/patches/patch-mk_main.mk diff -u /dev/null pkgsrc/lang/rust/patches/patch-mk_main.mk:1.1 --- /dev/null Thu Feb 23 09:35:17 2017 +++ pkgsrc/lang/rust/patches/patch-mk_main.mk Thu Feb 23 09:35:16 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-mk_main.mk,v 1.1 2017/02/23 09:35:16 jperkin Exp $ + +Specify full path to stage0 to work around NetBSD $ORIGIN issues. + +--- mk/main.mk.orig 2017-02-09 01:37:48.000000000 +0000 ++++ mk/main.mk +@@ -398,7 +398,7 @@ define SREQ + + # Destinations of artifacts for the host compiler + HROOT$(1)_H_$(3) = $(3)/stage$(1) +-HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin ++HBIN$(1)_H_$(3) = $$(CURDIR)/$$(HROOT$(1)_H_$(3))/bin + + ifeq ($$(CFG_WINDOWSY_$(3)),1) + # On Windows we always store host runtime libraries in the 'bin' directory because Index: pkgsrc/lang/rust/patches/patch-src_grammar_check.sh diff -u /dev/null pkgsrc/lang/rust/patches/patch-src_grammar_check.sh:1.1 --- /dev/null Thu Feb 23 09:35:17 2017 +++ pkgsrc/lang/rust/patches/patch-src_grammar_check.sh Thu Feb 23 09:35:16 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_grammar_check.sh,v 1.1 2017/02/23 09:35:16 jperkin Exp $ + +Shell portability fix. + +--- src/grammar/check.sh.orig 2017-02-09 01:37:48.000000000 +0000 ++++ src/grammar/check.sh +@@ -9,7 +9,7 @@ + # Argument $1 is the file to check, $2 is the classpath to use, $3 is the path + # to the grun binary, $4 is the path to the verify binary, $5 is the path to + # RustLexer.tokens +-if [ "${VERBOSE}" == "1" ]; then ++if [ "${VERBOSE}" = "1" ]; then + set -x + fi + Index: pkgsrc/lang/rust/patches/patch-src_libcompiler__builtins_build.rs diff -u /dev/null pkgsrc/lang/rust/patches/patch-src_libcompiler__builtins_build.rs:1.1 --- /dev/null Thu Feb 23 09:35:17 2017 +++ pkgsrc/lang/rust/patches/patch-src_libcompiler__builtins_build.rs Thu Feb 23 09:35:16 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_libcompiler__builtins_build.rs,v 1.1 2017/02/23 09:35:16 jperkin Exp $ + +Don't build gcc_personality_v0.o 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"]); + } + Index: pkgsrc/lang/rust/patches/patch-src_libstd_sys_unix_os.rs diff -u /dev/null pkgsrc/lang/rust/patches/patch-src_libstd_sys_unix_os.rs:1.1 --- /dev/null Thu Feb 23 09:35:17 2017 +++ pkgsrc/lang/rust/patches/patch-src_libstd_sys_unix_os.rs Thu Feb 23 09:35:16 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_libstd_sys_unix_os.rs,v 1.1 2017/02/23 09:35:16 jperkin Exp $ + +Match prototype (XXX: use POSIX_PTHREAD_SEMANTICS) + +--- src/libstd/sys/unix/os.rs.orig 2016-12-20 23:34:55.000000000 +0000 ++++ src/libstd/sys/unix/os.rs +@@ -506,7 +506,7 @@ pub fn home_dir() -> Option { + // getpwuid_r semantics is different on Illumos/Solaris: + // http://illumos.org/man/3c/getpwuid_r + let result = libc::getpwuid_r(me, passwd, buf.as_mut_ptr(), +- buf.capacity()); ++ buf.capacity() as libc::c_int); + if result.is_null() { None } else { Some(()) } + } + --_----------=_1487842517255420--