Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 443108) +++ head/lang/rust/Makefile (revision 443109) @@ -1,247 +1,248 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.17.0 +PORTVERSION?= 1.18.0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ https://static.rust-lang.org/dist/:rust_bootstrap \ + https://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 BOOTSTRAP_FILES=${RUSTC_BOOTSTRAP}:rust_bootstrap \ ${RUST_STD_BOOTSTRAP}:rust_bootstrap \ ${CARGO_BOOTSTRAP}:cargo_bootstrap DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}:src \ ${BOOTSTRAP_FILES} .if !defined(SKIP_CARGO_REGISTRY) MASTER_SITES+= LOCAL/riggs/rust:registry \ LOCAL/dumbbell/rust:registry DISTFILES+= ${CARGO_REGISTRY}:registry .endif DIST_SUBDIR?= rust EXTRACT_ONLY?= ${DISTFILES:N*\:*bootstrap:C/:.*//} -MAINTAINER?= riggs@FreeBSD.org +MAINTAINER?= rust@FreeBSD.org COMMENT= Language with a focus on memory safety and concurrency LICENSE= APACHE20 \ MIT LICENSE_COMB= dual # APACHE20 license is standard, see Templates/Licenses/APACHE20 LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT BUILD_DEPENDS= cmake:devel/cmake ONLY_FOR_ARCHS?= amd64 i386 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler # FIXME: The bootstrapped rustc adds -L/usr/local/lib in front of # the LDFLAGS. When stage0's rustc is linked, it picks the installed # librust*so and fails. CONFLICTS_BUILD?= rust-nightly CONFLICTS_BUILD+= ${PKGBASE} CONFLICTS_INSTALL?= rust-nightly -RUST_BOOTSTRAP_DIR?= 2017-03-11 -RUST_BOOTSTRAP_VERSION?= 1.16.0 +RUST_BOOTSTRAP_DIR?= 2017-04-27 +RUST_BOOTSTRAP_VERSION?= 1.17.0 RUSTC_BOOTSTRAP= ${RUST_BOOTSTRAP_DIR}/rustc-${RUST_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${RUST_BOOTSTRAP_DIR}/rust-std-${RUST_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz -CARGO_BOOTSTRAP_DIR?= 6b05583d71f982bcad049b9fa094c637c062e751 -CARGO_BOOTSTRAP_VERSION?= nightly +CARGO_BOOTSTRAP_DIR?= ${RUST_BOOTSTRAP_DIR} +CARGO_BOOTSTRAP_VERSION?= 0.18.0 CARGO_BOOTSTRAP= ${CARGO_BOOTSTRAP_DIR}/cargo-${CARGO_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz CARGO_REGISTRY= ${PORTNAME}-registry-${DISTVERSIONFULL}.tar.xz RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//} # Rust's target arch string is different from *BSD arch strings RUST_ARCH_x86_64= x86_64 # dragonfly RUST_ARCH_amd64= x86_64 RUST_ARCH_i386= i686 RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} PLIST_SUB+= RUST_TARGET=${RUST_TARGET} USES= compiler gmake libedit python:2,build HAS_CONFIGURE= yes CONFIGURE_ARGS= --disable-valgrind \ ${CHOSEN_COMPILER_TYPE:Mclang:C/.+/--enable-&/} \ --prefix=${PREFIX} \ --musl-root=${PREFIX} \ --local-rust-root=${PREFIX} \ --mandir=${MANPREFIX}/man \ --release-channel=${RUST_CHANNEL} MAKE_ARGS+= VERBOSE=1 OPTIONS_DEFINE= DOCS GDB LLNEXTGEN PORT_LLVM GDB_DESC= Install ports gdb (necessary for debugging rust programs) LLNEXTGEN_DESC= Build with grammar verification DOCS_CONFIGURE_ENABLE= docs GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb LLNEXTGEN_BUILD_DEPENDS= LLnextgen:devel/llnextgen # Rust may pass more regression tests with bundled LLVM PORT_LLVM_DESC= Build against devel/llvm${LLVM_VER} instead of bundled version PORT_LLVM_BUILD_DEPENDS= ${LLVM_PREFIX}/bin/FileCheck:devel/llvm${LLVM_VER} PORT_LLVM_CONFIGURE_ON= --llvm-root=${LLVM_PREFIX} LLVM_VER?= 40 LLVM_PREFIX= ${LOCALBASE}/llvm${LLVM_VER} # Note that make test does not work when rust is already installed TEST_TARGET= check TEST_ENV+= ALLOW_NONZERO_RLIMIT_CORE=1 # Rust manifests list all files and directories installed by rust-installer. # We use them in: # - pre-install to cleanup the ${STAGEDIR} # - post-install to populate the ${TMPPLIST} RUST_MANIFESTS= lib/rustlib/manifest-rustc \ lib/rustlib/manifest-rust-std-${RUST_TARGET} RUST_DOCS_MANIFESTS= lib/rustlib/manifest-rust-docs DOCS_VARS= rust_manifests+=${RUST_DOCS_MANIFESTS} PLIST_FILES= lib/rustlib/components \ lib/rustlib/rust-installer-version .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ino64 .endif pre-fetch: # FIXME: This is the same check for CONFLICTS as the standard # one, except port origins are not compared. This allows # the port to conflict with itself, because Rust would pick # installed Rust libraries instead of freshly built ones. @conflicts_with=$$( \ { ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : ; } \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" ]; then \ ${ECHO_CMD} -n " $${pkgname}"; \ fi; \ done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ for entry in $${conflicts_with}; do \ ${ECHO_MSG} " $${entry}"; \ done; \ ${ECHO_MSG}; \ ${ECHO_MSG} " They will not build together."; \ ${ECHO_MSG} " Please remove them first with pkg delete."; \ exit 1;\ fi LIBSTD= rust-std-1.16.0-${RUST_ARCH_${ARCH}}-unknown-freebsd/rust-std-${RUST_ARCH_${ARCH}}-unknown-freebsd/lib/rustlib/${RUST_ARCH_${ARCH}}-unknown-freebsd/lib/libstd-aef6cb139bd07bdc.rlib STDF= std-aef6cb139bd07bdc.0.o post-extract: @${MKDIR} \ ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} \ ${WRKSRC}/build/cache/${CARGO_BOOTSTRAP_DIR} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP} \ ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} .if ${OPSYS} != FreeBSD || ${OSVERSION} < 1200031 ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} \ ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} .endif ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP} \ ${WRKSRC}/build/cache/${CARGO_BOOTSTRAP_DIR} ${TAR} -x -C ${WRKSRC} -f ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 ${CC} ${CFLAGS} -fPIC -c -o ${WRKSRC}/old_fstat.o ${FILESDIR}/old_fstat.c (cd ${WRKSRC} && ${AR} x ${WRKSRC}/${LIBSTD} ${STDF}) ${LD} -r -o ${WRKSRC}/std.xx.o ${WRKSRC}/${STDF} ${WRKSRC}/old_fstat.o ${MV} ${WRKSRC}/std.xx.o ${WRKSRC}/${STDF} (cd ${WRKSRC} && ${AR} r ${WRKSRC}/${LIBSTD} ${STDF}) ${TAR} -cy -C ${WRKSRC} -f ${WRKSRC}/rustc.tbz rust-std-1.16.0-${RUST_ARCH_${ARCH}}-unknown-freebsd ${MV} ${WRKSRC}/rustc.tbz ${WRKSRC}/build/cache/${RUST_STD_BOOTSTRAP} .endif post-patch: @test ! -f ${WRKSRC}/mk/main.mk || \ ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mk/main.mk @${REINPLACE_CMD} -e 's|gdb|${LOCALBASE}/bin/gdb|' \ ${WRKSRC}/src/etc/rust-gdb # In case the previous "make stage" failed, this ensures rust's # install.sh won't backup previously staged files before reinstalling # new ones. Otherwise, the staging directory is polluted with unneeded # files. pre-install: @for f in ${RUST_MANIFESTS} ${RUST_DOCS_MANIFESTS}; do \ if test -f "${STAGEDIR}${PREFIX}/$$f"; then \ ${SED} -E -e 's,^(file|dir):,${STAGEDIR},' \ < "${STAGEDIR}${PREFIX}/$$f" \ | ${XARGS} ${RM} -r; \ ${RM} "${STAGEDIR}${PREFIX}/$$f"; \ fi; \ done @for f in ${PLIST_FILES}; do \ ${RM} "${STAGEDIR}${PREFIX}/$$f"; \ done # In post-install, we use the manifests generated during Rust install # to in turn generate the PLIST. We do that, instead of the regular # `pkg-plist`, because several libraries have a computed filename based # on the absolute path of the source files. As it is user-specific, we # can't know their filename in advance. # # We fix manpage entries in the generated manifests because Rust # installs them uncompressed but the Ports framework compresses them. post-install: for f in ${RUST_MANIFESTS}; do \ ${REINPLACE_CMD} -E \ -e 's|:${STAGEDIR}|:|' \ -e 's|(man/man[1-9]/.*\.[0-9])|\1.gz|' \ ${STAGEDIR}${PREFIX}/$$f; \ ${RM} ${STAGEDIR}${PREFIX}/$$f.bak; \ ${ECHO} "${PREFIX}/$$f" >> ${TMPPLIST}; \ ${AWK} '\ /^file:/ { \ file=$$0; \ sub(/^file:/, "", file); \ print file; \ } \ /^dir:/ { \ dir=$$0; \ sub(/^dir:/, "", dir); \ system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s|${STAGEDIR}||\""); \ }' \ ${STAGEDIR}${PREFIX}/$$f >> ${TMPPLIST}; \ done @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh # FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped, # but they contain non-object files which make strip(1) unhappy. @${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/bin/rustc \ ${STAGEDIR}${PREFIX}/bin/rustdoc \ ${STAGEDIR}${PREFIX}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so .include # "make gen-registry" is a special target to ease this port update. # # After changing the version number and the Git revision, you can run # "make gen-registry" to update the distinfo and create a new snapshot of # the registry. The new registry is written to ${DISTDIR} and can be # uploaded. gen-registry: ${MAKE} -C${.CURDIR} -DSKIP_CARGO_REGISTRY makesum ${MAKE} -C${.CURDIR} -DSKIP_CARGO_REGISTRY ${TAR} cJvf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_REGISTRY} -C${WRKDIR} \ --uid 0 --gid 0 \ --exclude 'src/*/benches/' \ --exclude 'src/*/ci/' \ --exclude 'src/*/examples/' \ --exclude 'src/*/tests/' \ --exclude 'index/github.com-*/.git/' \ .cargo ${MAKE} -C${.CURDIR} makesum Index: head/lang/rust/distinfo =================================================================== --- head/lang/rust/distinfo (revision 443108) +++ head/lang/rust/distinfo (revision 443109) @@ -1,17 +1,17 @@ -TIMESTAMP = 1494452289 -SHA256 (rust/rustc-1.17.0-src.tar.gz) = 4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87 -SIZE (rust/rustc-1.17.0-src.tar.gz) = 31570599 -SHA256 (rust/2017-03-11/rustc-1.16.0-x86_64-unknown-freebsd.tar.gz) = d88e4990850cf8bbcc26c5209008b1ecf18fedec1520c33e9aa991f71dcdd45b -SIZE (rust/2017-03-11/rustc-1.16.0-x86_64-unknown-freebsd.tar.gz) = 41099546 -SHA256 (rust/2017-03-11/rust-std-1.16.0-x86_64-unknown-freebsd.tar.gz) = d228af9d8600394e5fe706495c715065f8cd03b987bec1e95fb6ca761f252ad5 -SIZE (rust/2017-03-11/rust-std-1.16.0-x86_64-unknown-freebsd.tar.gz) = 54920061 -SHA256 (rust/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 924b172afe6a990ae19b346ef5ca2a6203f68a22af8d7229039fdc28068ff125 -SIZE (rust/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4970379 -SHA256 (rust/2017-03-11/rustc-1.16.0-i686-unknown-freebsd.tar.gz) = 6d32e211c0e9d33adc65f96f06d3996d8e167a29df85ddc6d877d424f82c7443 -SIZE (rust/2017-03-11/rustc-1.16.0-i686-unknown-freebsd.tar.gz) = 42809380 -SHA256 (rust/2017-03-11/rust-std-1.16.0-i686-unknown-freebsd.tar.gz) = 62c2f030cefe475b7c9e349543f134d3a9ad22830b0422db8230f47e7619fc5f -SIZE (rust/2017-03-11/rust-std-1.16.0-i686-unknown-freebsd.tar.gz) = 56177493 -SHA256 (rust/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-freebsd.tar.gz) = d78cf656a4393e2b65d03391e29081fa6e337fd2cf4ad896227a385cbbec7cf4 -SIZE (rust/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-freebsd.tar.gz) = 4793178 -SHA256 (rust/rust-registry-1.17.0.tar.xz) = 6f42ca97bbcc195d8140a3e62db6797c8ed2e86ed763b7c63aaf32edcbcd2556 -SIZE (rust/rust-registry-1.17.0.tar.xz) = 7364540 +TIMESTAMP = 1497099586 +SHA256 (rust/2017-04-27/rustc-1.17.0-x86_64-unknown-freebsd.tar.gz) = 7eb40cae153251596668a76ff8d4852a6d40249d8d0bc11dc8e15f58379c63e7 +SIZE (rust/2017-04-27/rustc-1.17.0-x86_64-unknown-freebsd.tar.gz) = 41907092 +SHA256 (rust/2017-04-27/rust-std-1.17.0-x86_64-unknown-freebsd.tar.gz) = 2ddbd37c51b9d6496448393ccf1940f3dd8f44720205f869cf98e151b4faeafe +SIZE (rust/2017-04-27/rust-std-1.17.0-x86_64-unknown-freebsd.tar.gz) = 56083145 +SHA256 (rust/2017-04-27/cargo-0.18.0-x86_64-unknown-freebsd.tar.gz) = 171147f876c08cf82a6da60fabf737fd580df90e2fec9c57368642beaea67450 +SIZE (rust/2017-04-27/cargo-0.18.0-x86_64-unknown-freebsd.tar.gz) = 5039329 +SHA256 (rust/rustc-1.18.0-src.tar.gz) = d2dc36e99b9e2269488b2bcddde43c234e6bde03edf70cba82a027ff49c36111 +SIZE (rust/rustc-1.18.0-src.tar.gz) = 33111774 +SHA256 (rust/2017-04-27/rustc-1.17.0-i686-unknown-freebsd.tar.gz) = c6d9685862ad8c539698e8d2a936598bb5d57c8cd074e03c66aa4367453ddf50 +SIZE (rust/2017-04-27/rustc-1.17.0-i686-unknown-freebsd.tar.gz) = 43636047 +SHA256 (rust/2017-04-27/rust-std-1.17.0-i686-unknown-freebsd.tar.gz) = 51304792a00ce0009be97f802511df0bd18abae3892ddc3f3828fa60e94996ff +SIZE (rust/2017-04-27/rust-std-1.17.0-i686-unknown-freebsd.tar.gz) = 57341618 +SHA256 (rust/2017-04-27/cargo-0.18.0-i686-unknown-freebsd.tar.gz) = 30ec4cfc667e3a8fca3cb0377b6a6f5dbcd19ad7143046db24e37432646e60a2 +SIZE (rust/2017-04-27/cargo-0.18.0-i686-unknown-freebsd.tar.gz) = 4914461 +SHA256 (rust/rust-registry-1.18.0.tar.xz) = 86c74c61aec5b94c9db9f569e6aa5cfeab2dde2a4ba73ea1da4c7320b31f5b36 +SIZE (rust/rust-registry-1.18.0.tar.xz) = 7714840 Index: head/lang/rust/files/patch-src_librustc__llvm_build.rs =================================================================== --- head/lang/rust/files/patch-src_librustc__llvm_build.rs (revision 443108) +++ head/lang/rust/files/patch-src_librustc__llvm_build.rs (revision 443109) @@ -1,11 +1,11 @@ ---- src/librustc_llvm/build.rs.orig 2017-02-09 01:37:48 UTC +--- src/librustc_llvm/build.rs.orig 2017-06-06 00:42:59 UTC +++ src/librustc_llvm/build.rs -@@ -233,6 +233,8 @@ fn main() { - // OpenBSD has a particular C++ runtime library name +@@ -241,6 +241,8 @@ fn main() { let stdcppname = if target.contains("openbsd") { + // OpenBSD has a particular C++ runtime library name "estdc++" + } else if target.contains("freebsd") { + "c++" - } else { - "stdc++" - }; + } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() { + // NetBSD uses a separate library when relocation is required + "stdc++_pic"