svn commit: r423067 - in head/lang/rust: . files
Thomas Zander
riggs at FreeBSD.org
Sat Oct 1 14:28:40 UTC 2016
Author: riggs
Date: Sat Oct 1 14:28:38 2016
New Revision: 423067
URL: https://svnweb.freebsd.org/changeset/ports/423067
Log:
Update to upstream release 1.12.0
Added:
head/lang/rust/files/patch-src_compiler-rt_cmake_base-config-ix.cmake
- copied, changed from r423066, head/lang/rust/files/patch-src_compiler-rt_cmake_config-ix.cmake
Deleted:
head/lang/rust/files/patch-mk_rt.mk
head/lang/rust/files/patch-src_compiler-rt_cmake_config-ix.cmake
Modified:
head/lang/rust/Makefile
head/lang/rust/distinfo.amd64
head/lang/rust/distinfo.i386
head/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk
head/lang/rust/files/patch-src_etc_get-stage0.py
Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile Sat Oct 1 14:28:18 2016 (r423066)
+++ head/lang/rust/Makefile Sat Oct 1 14:28:38 2016 (r423067)
@@ -2,7 +2,7 @@
# $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 \
@@ -27,7 +27,7 @@ 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}
@@ -38,7 +38,7 @@ 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.
Modified: head/lang/rust/distinfo.amd64
==============================================================================
--- head/lang/rust/distinfo.amd64 Sat Oct 1 14:28:18 2016 (r423066)
+++ head/lang/rust/distinfo.amd64 Sat Oct 1 14:28:38 2016 (r423067)
@@ -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
Modified: head/lang/rust/distinfo.i386
==============================================================================
--- head/lang/rust/distinfo.i386 Sat Oct 1 14:28:18 2016 (r423066)
+++ head/lang/rust/distinfo.i386 Sat Oct 1 14:28:38 2016 (r423067)
@@ -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
Modified: head/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk
==============================================================================
--- head/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk Sat Oct 1 14:28:18 2016 (r423066)
+++ head/lang/rust/files/patch-mk_cfg_i686-unknown-freebsd.mk Sat Oct 1 14:28:38 2016 (r423067)
@@ -1,14 +1,14 @@
---- 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 :=
Copied and modified: head/lang/rust/files/patch-src_compiler-rt_cmake_base-config-ix.cmake (from r423066, head/lang/rust/files/patch-src_compiler-rt_cmake_config-ix.cmake)
==============================================================================
--- head/lang/rust/files/patch-src_compiler-rt_cmake_config-ix.cmake Sat Oct 1 14:28:18 2016 (r423066, copy source)
+++ head/lang/rust/files/patch-src_compiler-rt_cmake_base-config-ix.cmake Sat Oct 1 14:28:38 2016 (r423067)
@@ -1,26 +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 "" "")
+--- 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()
-- test_target_arch(x86_64 "" "")
+- if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+- test_target_arch(i386 "" "")
+- else()
+- test_target_arch(x86_64 "" "")
+- endif()
- 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)
+ elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc")
+ TEST_BIG_ENDIAN(HOST_IS_BIG_ENDIAN)
+ if(HOST_IS_BIG_ENDIAN)
Modified: head/lang/rust/files/patch-src_etc_get-stage0.py
==============================================================================
--- head/lang/rust/files/patch-src_etc_get-stage0.py Sat Oct 1 14:28:18 2016 (r423066)
+++ head/lang/rust/files/patch-src_etc_get-stage0.py Sat Oct 1 14:28:38 2016 (r423067)
@@ -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):
More information about the svn-ports-head
mailing list