Date: Mon, 15 Jun 2020 22:26:47 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539297 - in head/lang: rust rust-nightly Message-ID: <202006152226.05FMQls8036493@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Jun 15 22:26:47 2020 New Revision: 539297 URL: https://svnweb.freebsd.org/changeset/ports/539297 Log: lang/rust-nightly: Update to 1.46.0.20200615 - Try building LLVM with Ninja - Move post-configure to lang/rust Changes: https://github.com/rust-lang/rust/compare/826cb062a6...4fb54ed484 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 Mon Jun 15 22:24:33 2020 (r539296) +++ head/lang/rust-nightly/Makefile Mon Jun 15 22:26:47 2020 (r539297) @@ -18,16 +18,11 @@ DISTINFO_FILE= ${.CURDIR}/distinfo # Get latest from top level 'date' key in # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2020-06-06 +NIGHTLY_DATE= 2020-06-15 # See WRKSRC/src/stage0.txt for this date BOOTSTRAPS_DATE= 2020-06-03 RUST_BOOTSTRAP_VERSION= beta CARGO_BOOTSTRAP_VERSION= beta - -post-configure: -# Don't abort if optional tools fail to build -# https://github.com/rust-lang/rust/commit/53254a888b42 - @${ECHO_CMD} 'missing-tools = true' >>${WRKSRC}/config.toml .include "${MASTERDIR}/Makefile" Modified: head/lang/rust-nightly/distinfo ============================================================================== --- head/lang/rust-nightly/distinfo Mon Jun 15 22:24:33 2020 (r539296) +++ head/lang/rust-nightly/distinfo Mon Jun 15 22:26:47 2020 (r539297) @@ -1,6 +1,6 @@ -TIMESTAMP = 1591453542 -SHA256 (rust/2020-06-06/rustc-nightly-src.tar.xz) = 68932b2a8c5e97988a1ec725e65abe103775ebd08e1a38db5c9a935a9ba2a103 -SIZE (rust/2020-06-06/rustc-nightly-src.tar.xz) = 98690188 +TIMESTAMP = 1592254366 +SHA256 (rust/2020-06-15/rustc-nightly-src.tar.xz) = be38bcd95cea577270f160a824117dd5c5a03616d276e184a020ddba44c190ec +SIZE (rust/2020-06-15/rustc-nightly-src.tar.xz) = 98793480 SHA256 (rust/2020-06-03/rustc-beta-x86_64-unknown-freebsd.tar.xz) = a3b29f2cbc8c4eb62391feb45ff4abe49ca25b2499b2c380db04d203059a97cd SIZE (rust/2020-06-03/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 40647540 SHA256 (rust/2020-06-03/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = f7b590c2b175fdb7c7d33f22edf49ce049b2cabfe8c907bb15226bfcdbbe716f Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Mon Jun 15 22:24:33 2020 (r539296) +++ head/lang/rust/Makefile Mon Jun 15 22:26:47 2020 (r539297) @@ -29,6 +29,9 @@ ONLY_FOR_ARCHS_REASON?= requires prebuilt bootstrap co BUILD_DEPENDS= cmake:devel/cmake \ libgit2>=1.0.0:devel/libgit2 +.if defined(NIGHTLY_DATE) +BUILD_DEPENDS+= ninja:devel/ninja +.endif LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 @@ -157,6 +160,9 @@ do-configure: .else @${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml .endif +.if defined(NIGHTLY_DATE) + @${ECHO_CMD} 'ninja=true' >> ${WRKSRC}/config.toml +.endif .if ${ARCH} == armv6 # fails to link with base ld.bfd: rustc_codegen_llvm.e2557spx-cgu.11:(.text._ZN89_$LT$rustc_target..abi..call..CastTarget$u20$as$u20$rustc_codegen_llvm..abi..LlvmType$GT$9llvm_type17h1296210ab461fc57E+0x54): relocation truncated to fit: R_ARM_CALL against symbol `__aeabi_uldivmod' defined in .text.__aeabi_uldivmod section in /tmp/rustcdnGbao/libcompiler_builtins-ee65b414e4115a8f.rlib(compiler_builtins-ee65b414e4115a8f.compiler_builtins.ay8p39ey-cgu.13.rcgu.o) @${PRINTF} '#!/bin/sh\nexec ${CC} -fuse-ld=lld "$$@"' > ${WRKDIR}/cc-wrapper @@ -175,6 +181,10 @@ do-configure: .endfor @${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml +.if defined(NIGHTLY_DATE) +# Don't abort if optional tools fail to build + @${ECHO_CMD} 'missing-tools=true' >> ${WRKSRC}/config.toml +.endif @${REINPLACE_CMD} 's,%CC%,${CC},g' \ ${WRKSRC}/src/librustc_llvm/build.rs \ ${WRKSRC}/src/bootstrap/native.rs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006152226.05FMQls8036493>