update lang/rust to 1.6.0

ok juanfra@
This commit is contained in:
semarie 2016-01-22 09:03:14 +00:00
parent 9e020664ce
commit 6cc1d59ac2
9 changed files with 4965 additions and 955 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2016/01/13 07:39:07 semarie Exp $
# $OpenBSD: Makefile,v 1.14 2016/01/22 09:03:14 semarie Exp $
# snapshots are only available for amd64, for now
ONLY_FOR_ARCHS = amd64
@ -7,10 +7,9 @@ PKG_ARCH-doc = *
COMMENT-main = compiler for Rust Language
COMMENT-doc = html documentation for rustc
V = 1.5.0
RUST_HASH = 35c36e89
V = 1.6.0
RUST_HASH = ca9f0d77
DISTNAME = rustc-${V}-src
REVISION = 0
SUBST_VARS += RUST_HASH

View File

@ -1,4 +1,4 @@
SHA256 (rust/rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2) = SV8nV81ML4Z1aK3BSyfykjMtIcBS6I+4zX9HYKkbeTk=
SHA256 (rust/rustc-1.5.0-src.tar.gz) = ZBA3r3t7bK0LIxzCBnH4oxT78vQPwJAdC4d8OfyNpaA=
SHA256 (rust/rustc-1.6.0-src.tar.gz) = MAKkoAAEsHJ3Cavu/hqxsnMYReTat0Vm82OGGAG7MyY=
SIZE (rust/rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2) = 19863445
SIZE (rust/rustc-1.5.0-src.tar.gz) = 24586539
SIZE (rust/rustc-1.6.0-src.tar.gz) = 24978399

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-configure,v 1.5 2016/01/13 07:39:08 semarie Exp $
$OpenBSD: patch-configure,v 1.6 2016/01/22 09:03:15 semarie Exp $
Remove requirement for curl or wget.
The snapshot isn't downloaded but copied by post-configure.
--- configure.orig Fri Dec 4 21:18:59 2015
+++ configure Tue Dec 15 06:46:14 2015
@@ -721,7 +721,7 @@ putvar CFG_BOOTSTRAP_KEY
--- configure.orig Wed Jan 20 04:37:51 2016
+++ configure Wed Jan 20 19:36:15 2016
@@ -717,7 +717,7 @@ putvar CFG_BOOTSTRAP_KEY
step_msg "looking for build programs"

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-mk_platform_mk,v 1.2 2016/01/13 07:39:08 semarie Exp $
https://github.com/rust-lang/rust/pull/29794
--- mk/platform.mk.orig Sat Jan 9 09:59:06 2016
+++ mk/platform.mk Sat Jan 9 09:59:13 2016
@@ -208,14 +208,6 @@ define CFG_MAKE_TOOLCHAIN
ifeq ($$(findstring $(HOST_$(1)),arm aarch64 mips mipsel powerpc),)
- # On OpenBSD, we need to pass the path of libstdc++.so to the linker
- # (use path of libstdc++.a which is a known name for the same path)
- ifeq ($(OSTYPE_$(1)),unknown-openbsd)
- RUSTC_FLAGS_$(1)=-L "$$(dir $$(shell $$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \
- -print-file-name=lib$(CFG_STDCPP_NAME).a))" \
- $(RUSTC_FLAGS_$(1))
- endif
-
# On Bitrig, we need the relocation model to be PIC for everything
ifeq (,$(filter $(OSTYPE_$(1)),bitrig))
LLVM_MC_RELOCATION_MODEL="pic"

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-mk_target_mk,v 1.3 2016/01/22 09:03:15 semarie Exp $
https://github.com/rust-lang/rust/pull/30493
--- mk/target.mk.orig Thu Jan 21 06:06:48 2016
+++ mk/target.mk Thu Jan 21 06:07:11 2016
@@ -95,7 +95,6 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
$$(RUSTFLAGS_$(4)) \
$$(RUSTFLAGS$(1)_$(4)) \
$$(RUSTFLAGS$(1)_$(4)_T_$(2)) \
- $$(STDCPP_LIBDIR_RUSTFLAGS_$(2)) \
--out-dir $$(@D) \
-C extra-filename=-$$(CFG_FILENAME_EXTRA) \
$$<
@@ -129,9 +128,7 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
| $$(TBIN$(1)_T_$(2)_H_$(3))/
@$$(call E, rustc: $$@)
- $$(STAGE$(1)_T_$(2)_H_$(3)) \
- $$(STDCPP_LIBDIR_RUSTFLAGS_$(2)) \
- -o $$@ $$< --cfg $(4)
+ $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4)
endef

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-mk_tests_mk,v 1.3 2016/01/22 09:03:15 semarie Exp $
https://github.com/rust-lang/rust/pull/30493
--- mk/tests.mk.orig Thu Jan 21 06:07:18 2016
+++ mk/tests.mk Thu Jan 21 06:07:44 2016
@@ -393,8 +393,7 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \
$$(subst @,,$$(STAGE$(1)_T_$(2)_H_$(3))) -o $$@ $$< --test \
-L "$$(RT_OUTPUT_DIR_$(2))" \
$$(LLVM_LIBDIR_RUSTFLAGS_$(2)) \
- $$(RUSTFLAGS_$(4)) \
- $$(STDCPP_LIBDIR_RUSTFLAGS_$(2))
+ $$(RUSTFLAGS_$(4))
endef
@@ -664,9 +663,9 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
--android-cross-path=$(CFG_ANDROID_CROSS_PATH) \
--adb-path=$(CFG_ADB) \
--adb-test-dir=$(CFG_ADB_TEST_DIR) \
- --host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3)) $$(STDCPP_LIBDIR_RUSTFLAGS_$(3))" \
+ --host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3))" \
--lldb-python-dir=$(CFG_LLDB_PYTHON_DIR) \
- --target-rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2)) $$(STDCPP_LIBDIR_RUSTFLAGS_$(2))" \
+ --target-rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2))" \
$$(CTEST_TESTARGS)
ifdef CFG_VALGRIND_RPASS

View File

@ -1,5 +1,5 @@
$OpenBSD: patch-src_test_run-make_tools_mk,v 1.1 2016/01/13 07:39:08 semarie Exp $
https://github.com/rust-lang/rust/pull/29794
$OpenBSD: patch-src_test_run-make_tools_mk,v 1.2 2016/01/22 09:03:15 semarie Exp $
https://github.com/rust-lang/rust/pull/30493
--- src/test/run-make/tools.mk.orig Sat Jan 9 09:02:08 2016
+++ src/test/run-make/tools.mk Sat Jan 9 09:02:26 2016
@@ -85,11 +85,7 @@ ifeq ($(UNAME),Bitrig)

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2016/01/13 07:39:08 semarie Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2016/01/22 09:03:15 semarie Exp $
bin/rust-gdb
bin/rustc
@bin bin/rustdoc
@ -17,8 +17,10 @@ lib/librustc_driver-${RUST_HASH}.so
lib/librustc_front-${RUST_HASH}.so
lib/librustc_lint-${RUST_HASH}.so
lib/librustc_llvm-${RUST_HASH}.so
lib/librustc_metadata-${RUST_HASH}.so
lib/librustc_mir-${RUST_HASH}.so
lib/librustc_platform_intrinsics-${RUST_HASH}.so
lib/librustc_plugin-${RUST_HASH}.so
lib/librustc_privacy-${RUST_HASH}.so
lib/librustc_resolve-${RUST_HASH}.so
lib/librustc_trans-${RUST_HASH}.so
@ -71,8 +73,10 @@ lib/rustlib/${TRIPLE_ARCH}/lib/librustc_driver-${RUST_HASH}.so
lib/rustlib/${TRIPLE_ARCH}/lib/librustc_front-${RUST_HASH}.so
lib/rustlib/${TRIPLE_ARCH}/lib/librustc_lint-${RUST_HASH}.so
lib/rustlib/${TRIPLE_ARCH}/lib/librustc_llvm-${RUST_HASH}.so
lib/rustlib/${TRIPLE_ARCH}/lib/librustc_metadata-${RUST_HASH}.so
lib/rustlib/${TRIPLE_ARCH}/lib/librustc_mir-${RUST_HASH}.so
lib/rustlib/${TRIPLE_ARCH}/lib/librustc_platform_intrinsics-${RUST_HASH}.so
lib/rustlib/${TRIPLE_ARCH}/lib/librustc_plugin-${RUST_HASH}.so
lib/rustlib/${TRIPLE_ARCH}/lib/librustc_privacy-${RUST_HASH}.so
lib/rustlib/${TRIPLE_ARCH}/lib/librustc_resolve-${RUST_HASH}.so
lib/rustlib/${TRIPLE_ARCH}/lib/librustc_trans-${RUST_HASH}.so