Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 423066) +++ head/lang/rust/Makefile (revision 423067) @@ -1,183 +1,183 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.11.0 +PORTVERSION?= 1.12.0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ http://static.rust-lang.org/dist/:bootstrap \ https://github.com/dhuseby/rust-manual-snapshots/raw/master/:bootstrap \ LOCAL/marino:bootstrap DISTNAME?= ${PORTNAME}c-${PORTVERSION} DISTFILES?= ${DISTNAME}-src${EXTRACT_SUFX}:src DISTFILES+= ${RUST_BOOT}:bootstrap EXTRACT_ONLY?= ${DISTFILES:N*\:bootstrap:C/:.*//} MAINTAINER?= riggs@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 -BROKEN_FreeBSD_9= Only compiles on FreeBSD 10 and 11 +BROKEN_FreeBSD_9= Only compiles on FreeBSD 10 and later DISTINFO_FILE?= ${MASTERDIR}/distinfo.${ARCH} # 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_BOOT_VERSION?= 1.10.0 +RUST_BOOT_VERSION?= 1.11.0 RUST_BOOT= rustc-${RUST_BOOT_VERSION}-${RUST_TARGET}.tar.gz # Rust's libraries are named librustc_${component}-${RUST_VSN_HASH}.so. # The hash depends on Rust version and, if the channel is not "stable", # the channel name. See $(CFG_FILENAME_EXTRA) definition in mk/main.mk. RUST_VSN= ${PORTVERSION:C/\.[0-9]{8}$//} .if defined(.PARSEDIR) # fixes |make describe| on 9.x (which is BROKEN) RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//} .endif RUST_VSN_HASH!= /usr/bin/printf '%s' ${RUST_VSN}${PKGNAMESUFFIX} | /sbin/md5 -q | cut -c 1-8 PLIST_SUB+= RUST_VSN_HASH=${RUST_VSN_HASH} # 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} PORTDOCS= * .if defined(BATCH) || defined(PACKAGE_BUILDING) MAKE_ARGS+= VERBOSE=1 .endif 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?= 38 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 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 post-extract: @${MKDIR} ${WRKSRC}/dl ${LN} -sf ${DISTDIR}/${RUST_BOOT} ${WRKSRC}/dl ${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} + post-patch: @${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 manifest-rustc manifest-rust-std-${RUST_TARGET}; do \ if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \ ${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \ < ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \ | ${XARGS} ${RM}; \ fi; \ done @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/components \ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-std-${RUST_TARGET} \ ${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh pre-install-DOCS-on: @for f in manifest-rust-docs; do \ if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \ ${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \ < ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \ | ${XARGS} ${RM}; \ fi; \ done @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-docs post-install: @for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \ ${REINPLACE_CMD} -e 's|${STAGEDIR}||' \ ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \ ${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \ done @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log # 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 post-install-DOCS-on: @for f in manifest-rust-docs; do \ ${REINPLACE_CMD} -e 's|${STAGEDIR}||' \ ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \ ${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \ done @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/rust/html/extra .include Index: head/lang/rust/distinfo.amd64 =================================================================== --- head/lang/rust/distinfo.amd64 (revision 423066) +++ head/lang/rust/distinfo.amd64 (revision 423067) @@ -1,5 +1,5 @@ -TIMESTAMP = 1471599812 -SHA256 (rustc-1.11.0-src.tar.gz) = 3685034a78e70637bdfa3117619f759f2481002fd9abbc78cc0f737c9974de6a -SIZE (rustc-1.11.0-src.tar.gz) = 26126471 -SHA256 (rustc-1.10.0-x86_64-unknown-freebsd.tar.gz) = 6271a638b02c1022e251c9e1d1fd78d1df4a73bdf0d20b25aa74548546037b84 -SIZE (rustc-1.10.0-x86_64-unknown-freebsd.tar.gz) = 48480245 +TIMESTAMP = 1475264673 +SHA256 (rustc-1.12.0-src.tar.gz) = ac5907d6fa96c19bd5901d8d99383fb8755127571ead3d4070cce9c1fb5f337a +SIZE (rustc-1.12.0-src.tar.gz) = 27501444 +SHA256 (rustc-1.11.0-x86_64-unknown-freebsd.tar.gz) = 116d78e078def96f081692ccfe9290e74db895f2476cae3ef1eb408d41b3bba5 +SIZE (rustc-1.11.0-x86_64-unknown-freebsd.tar.gz) = 47381436 Index: head/lang/rust/distinfo.i386 =================================================================== --- head/lang/rust/distinfo.i386 (revision 423066) +++ head/lang/rust/distinfo.i386 (revision 423067) @@ -1,5 +1,5 @@ -TIMESTAMP = 1471599980 -SHA256 (rustc-1.11.0-src.tar.gz) = 3685034a78e70637bdfa3117619f759f2481002fd9abbc78cc0f737c9974de6a -SIZE (rustc-1.11.0-src.tar.gz) = 26126471 -SHA256 (rustc-1.10.0-i686-unknown-freebsd.tar.gz) = 962b9c6d010355bd27e8d9bd56044f2a8ad79671bdce7955d15a201e88c139c1 -SIZE (rustc-1.10.0-i686-unknown-freebsd.tar.gz) = 49499375 +TIMESTAMP = 1475264801 +SHA256 (rustc-1.12.0-src.tar.gz) = ac5907d6fa96c19bd5901d8d99383fb8755127571ead3d4070cce9c1fb5f337a +SIZE (rustc-1.12.0-src.tar.gz) = 27501444 +SHA256 (rustc-1.11.0-i686-unknown-freebsd.tar.gz) = 4936a1d6ac03ebfa38a2b1a8859f505f94e904add05163e7fe76bf1195988981 +SIZE (rustc-1.11.0-i686-unknown-freebsd.tar.gz) = 48352396 Index: head/lang/rust/files/patch-src_compiler-rt_cmake_config-ix.cmake =================================================================== --- head/lang/rust/files/patch-src_compiler-rt_cmake_config-ix.cmake (revision 423066) +++ head/lang/rust/files/patch-src_compiler-rt_cmake_config-ix.cmake (nonexistent) @@ -1,26 +0,0 @@ ---- src/compiler-rt/cmake/config-ix.cmake.orig 2016-08-16 01:54:40 UTC -+++ src/compiler-rt/cmake/config-ix.cmake -@@ -188,20 +188,9 @@ if(ANDROID) - set(COMPILER_RT_OS_SUFFIX "-android") - elseif(NOT APPLE) # Supported archs for Apple platforms are generated later - if("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "i[2-6]86|x86|amd64") -- if(NOT MSVC) -- test_target_arch(x86_64 "" "-m64") -- # FIXME: We build runtimes for both i686 and i386, as "clang -m32" may -- # target different variant than "$CMAKE_C_COMPILER -m32". This part should -- # be gone after we resolve PR14109. -- test_target_arch(i686 __i686__ "-m32") -- test_target_arch(i386 __i386__ "-m32") -- else() -- if (CMAKE_SIZEOF_VOID_P EQUAL 4) -- test_target_arch(i386 "" "") -- else() -- test_target_arch(x86_64 "" "") -- endif() -- endif() -+ test_target_arch(x86_64 "" "") -+ test_target_arch(i686 "" "") -+ test_target_arch(i386 "" "") - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc") - TEST_BIG_ENDIAN(HOST_IS_BIG_ENDIAN) - if(HOST_IS_BIG_ENDIAN) Property changes on: head/lang/rust/files/patch-src_compiler-rt_cmake_config-ix.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust/files/patch-mk_rt.mk =================================================================== --- head/lang/rust/files/patch-mk_rt.mk (revision 423066) +++ head/lang/rust/files/patch-mk_rt.mk (nonexistent) @@ -1,12 +0,0 @@ ---- mk/rt.mk.orig 2016-07-17 07:06:29 UTC -+++ mk/rt.mk -@@ -270,8 +270,7 @@ COMPRT_DEFINES_$(1) := -DCOMPILER_RT_ENA - endif - - ifndef COMPRT_DIR_$(1) --# NB: FreeBSD and NetBSD output to "linux"... --COMPRT_DIR_$(1) := linux -+COMPRT_DIR_$(1) := $$(word 3, $$(subst -, , $(1))) - COMPRT_ARCH_$(1) := $$(patsubst i586,i386,$$(COMPRT_ARCH_$(1))) - - ifeq ($$(findstring android,$(1)),android) Property changes on: head/lang/rust/files/patch-mk_rt.mk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk =================================================================== --- head/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk (revision 423066) +++ head/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk (revision 423067) @@ -1,15 +1,15 @@ ---- mk/cfg/i686-unknown-freebsd.mk.orig 2016-03-01 19:18:54 UTC +--- mk/cfg/i686-unknown-freebsd.mk.orig 2016-09-27 07:17:04 UTC +++ mk/cfg/i686-unknown-freebsd.mk @@ -7,9 +7,9 @@ CFG_LIB_NAME_i686-unknown-freebsd=lib$(1 CFG_STATIC_LIB_NAME_i686-unknown-freebsd=lib$(1).a CFG_LIB_GLOB_i686-unknown-freebsd=lib$(1)-*.so CFG_LIB_DSYM_GLOB_i686-unknown-freebsd=$(1)-*.dylib.dSYM -CFG_JEMALLOC_CFLAGS_i686-unknown-freebsd := -m32 -I/usr/local/include $(CFLAGS) --CFG_GCCISH_CFLAGS_i686-unknown-freebsd := -Wall -Werror -g -fPIC -m32 -arch i386 -I/usr/local/include $(CFLAGS) +-CFG_GCCISH_CFLAGS_i686-unknown-freebsd := -g -fPIC -m32 -arch i386 -I/usr/local/include $(CFLAGS) -CFG_GCCISH_LINK_FLAGS_i686-unknown-freebsd := -m32 -shared -fPIC -g -pthread -lrt +CFG_JEMALLOC_CFLAGS_i686-unknown-freebsd := -I/usr/local/include $(CFLAGS) -+CFG_GCCISH_CFLAGS_i686-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include $(CFLAGS) ++CFG_GCCISH_CFLAGS_i686-unknown-freebsd := -g -fPIC -arch i386 -I/usr/local/include $(CFLAGS) +CFG_GCCISH_LINK_FLAGS_i686-unknown-freebsd := -shared -fPIC -g -pthread -lrt CFG_GCCISH_DEF_FLAG_i686-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list= CFG_LLC_FLAGS_i686-unknown-freebsd := CFG_INSTALL_NAME_i686-unknown-freebsd = Index: head/lang/rust/files/patch-src_compiler-rt_cmake_base-config-ix.cmake =================================================================== --- head/lang/rust/files/patch-src_compiler-rt_cmake_base-config-ix.cmake (nonexistent) +++ head/lang/rust/files/patch-src_compiler-rt_cmake_base-config-ix.cmake (revision 423067) @@ -0,0 +1,26 @@ +--- src/compiler-rt/cmake/base-config-ix.cmake.orig 2016-09-27 07:17:10 UTC ++++ src/compiler-rt/cmake/base-config-ix.cmake +@@ -118,20 +118,9 @@ macro(test_targets) + set(COMPILER_RT_OS_SUFFIX "-android") + elseif(NOT APPLE) # Supported archs for Apple platforms are generated later + if("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "i[2-6]86|x86|amd64") +- if(NOT MSVC) +- test_target_arch(x86_64 "" "-m64") +- # FIXME: We build runtimes for both i686 and i386, as "clang -m32" may +- # target different variant than "$CMAKE_C_COMPILER -m32". This part should +- # be gone after we resolve PR14109. +- test_target_arch(i686 __i686__ "-m32") +- test_target_arch(i386 __i386__ "-m32") +- else() +- if (CMAKE_SIZEOF_VOID_P EQUAL 4) +- test_target_arch(i386 "" "") +- else() +- test_target_arch(x86_64 "" "") +- endif() +- endif() ++ test_target_arch(x86_64 "" "") ++ test_target_arch(i686 "" "") ++ test_target_arch(i386 "" "") + elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc") + TEST_BIG_ENDIAN(HOST_IS_BIG_ENDIAN) + if(HOST_IS_BIG_ENDIAN) Property changes on: head/lang/rust/files/patch-src_compiler-rt_cmake_base-config-ix.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/rust/files/patch-src_etc_get-stage0.py =================================================================== --- head/lang/rust/files/patch-src_etc_get-stage0.py (revision 423066) +++ head/lang/rust/files/patch-src_etc_get-stage0.py (revision 423067) @@ -1,14 +1,12 @@ ---- src/etc/get-stage0.py.orig 2016-08-16 01:54:35 UTC +--- src/etc/get-stage0.py.orig 2016-10-01 07:20:20 UTC +++ src/etc/get-stage0.py -@@ -31,9 +31,8 @@ def main(triple): +@@ -31,7 +31,8 @@ def main(triple): filename = 'rustc-{}-{}.tar.gz'.format(channel, triple) url = 'https://static.rust-lang.org/dist/{}/{}'.format(date, filename) dst = dl_dir + '/' + filename -- if os.path.exists(dst): -- os.unlink(dst) - bootstrap.get(url, dst) + if not os.path.exists(dst): -+ bootstrap.get(url, dst) ++ bootstrap.get(url, dst) stage0_dst = triple + '/stage0' if os.path.exists(stage0_dst):