Date: Sat, 20 Aug 2016 05:57:34 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420500 - in head/lang/rust: . files Message-ID: <201608200557.u7K5vYW3099644@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Aug 20 05:57:34 2016 New Revision: 420500 URL: https://svnweb.freebsd.org/changeset/ports/420500 Log: Update to upstream release 1.11.0 Added: head/lang/rust/files/patch-mk_rt.mk (contents, props changed) head/lang/rust/files/patch-src_compiler-rt_cmake_config-ix.cmake (contents, props changed) head/lang/rust/files/patch-src_etc_get-stage0.py (contents, props changed) Modified: head/lang/rust/Makefile head/lang/rust/distinfo.amd64 head/lang/rust/distinfo.i386 head/lang/rust/files/patch-configure head/lang/rust/pkg-plist Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Fri Aug 19 23:11:59 2016 (r420499) +++ head/lang/rust/Makefile Sat Aug 20 05:57:34 2016 (r420500) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.10.0 +PORTVERSION?= 1.11.0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ http://static.rust-lang.org/dist/:bootstrap \ @@ -22,6 +22,8 @@ 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 @@ -36,7 +38,7 @@ CONFLICTS_BUILD?= rust-nightly CONFLICTS_BUILD+= ${PKGBASE} CONFLICTS_INSTALL?= rust-nightly -RUST_BOOT_VERSION?= 1.9.0 +RUST_BOOT_VERSION?= 1.10.0 RUST_BOOT= rustc-${RUST_BOOT_VERSION}-${RUST_TARGET}.tar.gz # Rust's libraries are named librustc_${component}-${RUST_VSN_HASH}.so. Modified: head/lang/rust/distinfo.amd64 ============================================================================== --- head/lang/rust/distinfo.amd64 Fri Aug 19 23:11:59 2016 (r420499) +++ head/lang/rust/distinfo.amd64 Sat Aug 20 05:57:34 2016 (r420500) @@ -1,5 +1,5 @@ -TIMESTAMP = 1468066508 -SHA256 (rustc-1.10.0-src.tar.gz) = a4015aacf4f6d8a8239253c4da46e7abaa8584f8214d1828d2ff0a8f56176869 -SIZE (rustc-1.10.0-src.tar.gz) = 25967780 -SHA256 (rustc-1.9.0-x86_64-unknown-freebsd.tar.gz) = 18f92b24d69ae2e5a542072e0f302f96ac1af096069a752833e9574d559e62ed -SIZE (rustc-1.9.0-x86_64-unknown-freebsd.tar.gz) = 47969295 +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 Modified: head/lang/rust/distinfo.i386 ============================================================================== --- head/lang/rust/distinfo.i386 Fri Aug 19 23:11:59 2016 (r420499) +++ head/lang/rust/distinfo.i386 Sat Aug 20 05:57:34 2016 (r420500) @@ -1,5 +1,5 @@ -TIMESTAMP = 1468066935 -SHA256 (rustc-1.10.0-src.tar.gz) = a4015aacf4f6d8a8239253c4da46e7abaa8584f8214d1828d2ff0a8f56176869 -SIZE (rustc-1.10.0-src.tar.gz) = 25967780 -SHA256 (rustc-1.9.0-i686-unknown-freebsd.tar.gz) = 7781f654405301292e17fbde635e770a1bc6620278e89cbd6d0dc4eaa7d8a6db -SIZE (rustc-1.9.0-i686-unknown-freebsd.tar.gz) = 48830795 +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 Modified: head/lang/rust/files/patch-configure ============================================================================== --- head/lang/rust/files/patch-configure Fri Aug 19 23:11:59 2016 (r420499) +++ head/lang/rust/files/patch-configure Sat Aug 20 05:57:34 2016 (r420500) @@ -1,10 +1,10 @@ ---- configure.orig 2015-08-04 19:28:47 UTC +--- configure.orig 2016-08-16 01:54:35 UTC +++ configure -@@ -696,7 +696,6 @@ putvar CFG_BOOTSTRAP_KEY +@@ -726,7 +726,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 Added: head/lang/rust/files/patch-mk_rt.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust/files/patch-mk_rt.mk Sat Aug 20 05:57:34 2016 (r420500) @@ -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/files/patch-src_compiler-rt_cmake_config-ix.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust/files/patch-src_compiler-rt_cmake_config-ix.cmake Sat Aug 20 05:57:34 2016 (r420500) @@ -0,0 +1,26 @@ +--- 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) Added: head/lang/rust/files/patch-src_etc_get-stage0.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust/files/patch-src_etc_get-stage0.py Sat Aug 20 05:57:34 2016 (r420500) @@ -0,0 +1,14 @@ +--- src/etc/get-stage0.py.orig 2016-08-16 01:54:35 UTC ++++ src/etc/get-stage0.py +@@ -31,9 +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) + + stage0_dst = triple + '/stage0' + if os.path.exists(stage0_dst): Modified: head/lang/rust/pkg-plist ============================================================================== --- head/lang/rust/pkg-plist Fri Aug 19 23:11:59 2016 (r420499) +++ head/lang/rust/pkg-plist Sat Aug 20 05:57:34 2016 (r420500) @@ -15,6 +15,7 @@ lib/librustc_const_eval-%%RUST_VSN_HASH% 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_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 @@ -33,6 +34,7 @@ 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 @@ -70,6 +72,7 @@ lib/rustlib/%%RUST_TARGET%%/lib/librustc 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_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 @@ -90,6 +93,7 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608200557.u7K5vYW3099644>