Date: Tue, 26 Jul 2016 07:39:30 +0000 (UTC) From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419100 - in head/lang: rust rust-nightly rust-nightly/files Message-ID: <201607260739.u6Q7dUUM035053@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dumbbell (src committer) Date: Tue Jul 26 07:39:29 2016 New Revision: 419100 URL: https://svnweb.freebsd.org/changeset/ports/419100 Log: lang/rust-nightly: Update to 1.12.0; snapshot from 2016-07-17 Reviewed by: asomers, jbeich, riggs Approved by: jbeich, riggs Differential Revision: https://reviews.freebsd.org/D7275 Added: head/lang/rust-nightly/files/patch-mk_rt.mk (contents, props changed) head/lang/rust-nightly/files/patch-src_etc_get-stage0.py (contents, props changed) Modified: head/lang/rust-nightly/Makefile head/lang/rust-nightly/distinfo head/lang/rust-nightly/files/patch-configure head/lang/rust-nightly/files/patch-mk_main.mk head/lang/rust-nightly/pkg-plist head/lang/rust/Makefile Modified: head/lang/rust-nightly/Makefile ============================================================================== --- head/lang/rust-nightly/Makefile Tue Jul 26 06:16:19 2016 (r419099) +++ head/lang/rust-nightly/Makefile Tue Jul 26 07:39:29 2016 (r419100) @@ -1,7 +1,7 @@ # Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org> # $FreeBSD$ -PORTVERSION= 1.9.0.20160318 +PORTVERSION= 1.12.0.20160717 PKGNAMESUFFIX= -nightly DISTNAME= # DISTFILES= # @@ -10,8 +10,6 @@ MAINTAINER= dumbbell@FreeBSD.org ONLY_FOR_ARCHS= amd64 -BROKEN= does not build (no suitable checksum found for rustc-1.9.0-x86_64-unknown-freebsd.tar.gz) - MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo @@ -25,21 +23,23 @@ GH_PROJECT= rust \ jemalloc:jemalloc \ libc:liblibc \ rust-installer:rust_installer -GH_TAGNAME= 235d77457d \ - 57315f7:compiler_rt \ - 4638c60:hoedown \ - aab1c0a:jemalloc \ - 2278a54:liblibc \ +GH_TAGNAME= 7ed6068 \ + ac3d1cd:compiler_rt \ + a3736a0:hoedown \ + e058ca6:jemalloc \ + b0d6253:liblibc \ c37d374:rust_installer -CONFLICTS_BUILD= rust # see FIXME in lang/rust +BUILD_DEPENDS= cmake:devel/cmake + +CONFLICTS_BUILD= rust # see FIXME in `pre-fetch` in lang/rust/Makefile CONFLICTS_INSTALL= rust -RUST_BOOT_SIG_amd64= 2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804 +RUST_BOOT_VERSION= beta PORT_LLVM_EXTRACT_ONLY_OFF= ${DISTFILE_llvm} PORT_LLVM_GH_PROJECT_OFF= llvm:llvm -PORT_LLVM_GH_TAGNAME_OFF= 63f3a1b:llvm +PORT_LLVM_GH_TAGNAME_OFF= 7ca76af:llvm PORT_LLVM_VARS_OFF= NOPRECIOUSMAKEVARS=1 # ARCH post-extract: slave-post-extract Modified: head/lang/rust-nightly/distinfo ============================================================================== --- head/lang/rust-nightly/distinfo Tue Jul 26 06:16:19 2016 (r419099) +++ head/lang/rust-nightly/distinfo Tue Jul 26 07:39:29 2016 (r419100) @@ -1,16 +1,17 @@ -SHA256 (rust-stage0-2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804.tar.bz2) = 6123aa870918555835623548e7edbf79480cd754c649fda844dc3c14e4e142f2 -SIZE (rust-stage0-2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804.tar.bz2) = 15922558 -SHA256 (rust-lang-rust-1.9.0.20160318-235d77457d_GH0.tar.gz) = 6833cab6dc2c34a23cdabd565cb950b4e22f2606337c1d9f36c1a9e038eb4192 -SIZE (rust-lang-rust-1.9.0.20160318-235d77457d_GH0.tar.gz) = 5696553 -SHA256 (rust-lang-compiler-rt-57315f7_GH0.tar.gz) = d84fb1afd630c8dd9cca4fb37c4aa90b0b1ee95a7da04439ac109bcb2b63de3a -SIZE (rust-lang-compiler-rt-57315f7_GH0.tar.gz) = 2170312 -SHA256 (rust-lang-hoedown-4638c60_GH0.tar.gz) = c27c4fd8d24082ea6ced012dfefced9b4b2a3b90383b68276f08569803fe0c84 -SIZE (rust-lang-hoedown-4638c60_GH0.tar.gz) = 65837 -SHA256 (rust-lang-jemalloc-aab1c0a_GH0.tar.gz) = cc218c8b704b336a1eb562d58e1311937e3765c83018d00a6c3891a5a87e886a -SIZE (rust-lang-jemalloc-aab1c0a_GH0.tar.gz) = 469834 -SHA256 (rust-lang-libc-2278a54_GH0.tar.gz) = ee3ef64b8c59f2545d6b096f218d5362f713fb61ca0aa24f95b3e6c3dc30769a -SIZE (rust-lang-libc-2278a54_GH0.tar.gz) = 84299 +TIMESTAMP = 1469263493 +SHA256 (rustc-beta-x86_64-unknown-freebsd.tar.gz) = 13cd332d2756272063608cf6b2fd3189113855cbdbec1a318c7a673b1bdeb3dd +SIZE (rustc-beta-x86_64-unknown-freebsd.tar.gz) = 47337602 +SHA256 (rust-lang-rust-1.12.0.20160717-7ed6068_GH0.tar.gz) = 932f7469f4b8f8718bfb4c815b1918a08be80c0f4631bf5500b2c1291cd6aaf0 +SIZE (rust-lang-rust-1.12.0.20160717-7ed6068_GH0.tar.gz) = 5973649 +SHA256 (rust-lang-compiler-rt-ac3d1cd_GH0.tar.gz) = eae57dab65e49b465b0c541f43b7953139c37f86ea4ff4fb39685bdf9f31796b +SIZE (rust-lang-compiler-rt-ac3d1cd_GH0.tar.gz) = 2219925 +SHA256 (rust-lang-hoedown-a3736a0_GH0.tar.gz) = 4da9cf158087a5ae06c06bbd7c06c17b3ed879c3b61586cf6e0e225e2dd86ec5 +SIZE (rust-lang-hoedown-a3736a0_GH0.tar.gz) = 65842 +SHA256 (rust-lang-jemalloc-e058ca6_GH0.tar.gz) = 68cdda3ed591c7ffffa3f9b1870281230f82aa6270a6ca7a8555dd589aac64c6 +SIZE (rust-lang-jemalloc-e058ca6_GH0.tar.gz) = 470117 +SHA256 (rust-lang-libc-b0d6253_GH0.tar.gz) = 20336ab77e82d00ff33a4584f9c2e285d36aab9647ed903189e4b7f4215c5003 +SIZE (rust-lang-libc-b0d6253_GH0.tar.gz) = 103683 SHA256 (rust-lang-rust-installer-c37d374_GH0.tar.gz) = 7cc41029b14de023dd4f250b332470c98cf9d1a77d174a20e93d78d07e4255f1 SIZE (rust-lang-rust-installer-c37d374_GH0.tar.gz) = 19267 -SHA256 (rust-lang-llvm-63f3a1b_GH0.tar.gz) = 3181fb7ae7a3004ad92b35daf0e0d9bf1c93c1c65e3183718c61a3b622336e9f -SIZE (rust-lang-llvm-63f3a1b_GH0.tar.gz) = 23907407 +SHA256 (rust-lang-llvm-7ca76af_GH0.tar.gz) = f2c7171e5afaa1dda96f886db78ddc7ad38a7dc938acf17c93c2b4d93d47a551 +SIZE (rust-lang-llvm-7ca76af_GH0.tar.gz) = 23907809 Modified: head/lang/rust-nightly/files/patch-configure ============================================================================== --- head/lang/rust-nightly/files/patch-configure Tue Jul 26 06:16:19 2016 (r419099) +++ head/lang/rust-nightly/files/patch-configure Tue Jul 26 07:39:29 2016 (r419100) @@ -1,10 +1,10 @@ ---- configure.orig 2015-06-09 09:12:09 UTC +--- configure.orig 2016-07-17 07:06:29 UTC +++ configure -@@ -695,7 +695,6 @@ putvar CFG_BOOTSTRAP_KEY +@@ -737,7 +737,6 @@ if [ -n "$CFG_ENABLE_ORBIT" ]; then putv step_msg "looking for build programs" --probe_need CFG_CURLORWGET curl wget +-probe_need CFG_CURL curl if [ -z "$CFG_PYTHON_PROVIDED" ]; then - probe_need CFG_PYTHON python2.7 python2.6 python2 python + probe_need CFG_PYTHON python2.7 python2 python fi Modified: head/lang/rust-nightly/files/patch-mk_main.mk ============================================================================== --- head/lang/rust-nightly/files/patch-mk_main.mk Tue Jul 26 06:16:19 2016 (r419099) +++ head/lang/rust-nightly/files/patch-mk_main.mk Tue Jul 26 07:39:29 2016 (r419100) @@ -1,6 +1,6 @@ ---- mk/main.mk.orig 2015-09-03 11:50:44 UTC +--- mk/main.mk.orig 2016-07-17 07:06:29 UTC +++ mk/main.mk -@@ -107,7 +107,7 @@ ifneq ($(wildcard $(NON_BUILD_TARGET)),) +@@ -135,7 +135,7 @@ ifneq ($(wildcard $(NON_BUILD_TARGET)),) CFG_INFO := $(info cfg: non-build target triples $(NON_BUILD_TARGET)) endif Added: head/lang/rust-nightly/files/patch-mk_rt.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust-nightly/files/patch-mk_rt.mk Tue Jul 26 07:39:29 2016 (r419100) @@ -0,0 +1,12 @@ +--- 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) Added: head/lang/rust-nightly/files/patch-src_etc_get-stage0.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust-nightly/files/patch-src_etc_get-stage0.py Tue Jul 26 07:39:29 2016 (r419100) @@ -0,0 +1,12 @@ +--- src/etc/get-stage0.py.orig 2016-07-17 07:06:29 UTC ++++ src/etc/get-stage0.py +@@ -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 +- bootstrap.get(url, dst) ++ if not os.path.exists(dst): ++ bootstrap.get(url, dst) + + stage0_dst = triple + '/stage0' + if os.path.exists(stage0_dst): Modified: head/lang/rust-nightly/pkg-plist ============================================================================== --- head/lang/rust-nightly/pkg-plist Tue Jul 26 06:16:19 2016 (r419099) +++ head/lang/rust-nightly/pkg-plist Tue Jul 26 07:39:29 2016 (r419100) @@ -12,9 +12,11 @@ lib/librustc-%%RUST_VSN_HASH%%.so lib/librustc_back-%%RUST_VSN_HASH%%.so lib/librustc_borrowck-%%RUST_VSN_HASH%%.so lib/librustc_const_eval-%%RUST_VSN_HASH%%.so +lib/librustc_const_math-%%RUST_VSN_HASH%%.so lib/librustc_data_structures-%%RUST_VSN_HASH%%.so lib/librustc_driver-%%RUST_VSN_HASH%%.so -lib/librustc_front-%%RUST_VSN_HASH%%.so +lib/librustc_errors-%%RUST_VSN_HASH%%.so +lib/librustc_incremental-%%RUST_VSN_HASH%%.so lib/librustc_lint-%%RUST_VSN_HASH%%.so lib/librustc_llvm-%%RUST_VSN_HASH%%.so lib/librustc_metadata-%%RUST_VSN_HASH%%.so @@ -24,6 +26,7 @@ lib/librustc_platform_intrinsics-%%RUST_ lib/librustc_plugin-%%RUST_VSN_HASH%%.so lib/librustc_privacy-%%RUST_VSN_HASH%%.so lib/librustc_resolve-%%RUST_VSN_HASH%%.so +lib/librustc_save_analysis-%%RUST_VSN_HASH%%.so lib/librustc_trans-%%RUST_VSN_HASH%%.so lib/librustc_typeck-%%RUST_VSN_HASH%%.so lib/librustdoc-%%RUST_VSN_HASH%%.so @@ -31,14 +34,16 @@ lib/libserialize-%%RUST_VSN_HASH%%.so lib/libstd-%%RUST_VSN_HASH%%.so lib/libsyntax-%%RUST_VSN_HASH%%.so lib/libsyntax_ext-%%RUST_VSN_HASH%%.so +lib/libsyntax_pos-%%RUST_VSN_HASH%%.so lib/libterm-%%RUST_VSN_HASH%%.so lib/libtest-%%RUST_VSN_HASH%%.so 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/manifest-rustc +%%PORTDOCS%%lib/rustlib/manifest-rust-docs lib/rustlib/manifest-rust-std-%%RUST_TARGET%% +lib/rustlib/manifest-rustc lib/rustlib/rust-installer-version lib/rustlib/uninstall.sh lib/rustlib/%%RUST_TARGET%%/lib/liballoc-%%RUST_VSN_HASH%%.rlib @@ -55,17 +60,20 @@ lib/rustlib/%%RUST_TARGET%%/lib/libgetop lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/liblibc-%%RUST_VSN_HASH%%.rlib lib/rustlib/%%RUST_TARGET%%/lib/liblog-%%RUST_VSN_HASH%%.so +lib/rustlib/%%RUST_TARGET%%/lib/libpanic_abort-%%RUST_VSN_HASH%%.rlib +lib/rustlib/%%RUST_TARGET%%/lib/libpanic_unwind-%%RUST_VSN_HASH%%.rlib lib/rustlib/%%RUST_TARGET%%/lib/librand-%%RUST_VSN_HASH%%.rlib lib/rustlib/%%RUST_TARGET%%/lib/librbml-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-%%RUST_VSN_HASH%%.rlib lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-%%RUST_VSN_HASH%%.so -lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-%%RUST_VSN_HASH%%.rlib lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-%%RUST_VSN_HASH%%.so +lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-%%RUST_VSN_HASH%%.so -lib/rustlib/%%RUST_TARGET%%/lib/librustc_front-%%RUST_VSN_HASH%%.so +lib/rustlib/%%RUST_TARGET%%/lib/librustc_errors-%%RUST_VSN_HASH%%.so +lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-%%RUST_VSN_HASH%%.so @@ -75,6 +83,7 @@ lib/rustlib/%%RUST_TARGET%%/lib/librustc lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-%%RUST_VSN_HASH%%.so +lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/librustc_unicode-%%RUST_VSN_HASH%%.rlib @@ -84,16 +93,11 @@ lib/rustlib/%%RUST_TARGET%%/lib/libstd-% lib/rustlib/%%RUST_TARGET%%/lib/libstd-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-%%RUST_VSN_HASH%%.so +lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_pos-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/libterm-%%RUST_VSN_HASH%%.rlib lib/rustlib/%%RUST_TARGET%%/lib/libterm-%%RUST_VSN_HASH%%.so lib/rustlib/%%RUST_TARGET%%/lib/libtest-%%RUST_VSN_HASH%%.rlib lib/rustlib/%%RUST_TARGET%%/lib/libtest-%%RUST_VSN_HASH%%.so +lib/rustlib/%%RUST_TARGET%%/lib/libunwind-%%RUST_VSN_HASH%%.rlib man/man1/rustc.1.gz man/man1/rustdoc.1.gz -@dir lib/rustlib/%%RUST_TARGET%%/lib -@dir lib/rustlib/%%RUST_TARGET%% -@dir lib/rustlib -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/LICENSE-APACHE -%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIT -%%PORTDOCS%%%%DOCSDIR%%/README.md Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Tue Jul 26 06:16:19 2016 (r419099) +++ head/lang/rust/Makefile Tue Jul 26 07:39:29 2016 (r419100) @@ -36,8 +36,8 @@ CONFLICTS_BUILD?= rust-nightly CONFLICTS_BUILD+= ${PKGBASE} CONFLICTS_INSTALL?= rust-nightly -RUST_BOOT_VERSION= 1.9.0 -RUST_BOOT= rustc-${RUST_BOOT_VERSION}-${RUST_TARGET}.tar.gz +RUST_BOOT_VERSION?= 1.9.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",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607260739.u6Q7dUUM035053>