Hi, The following diff updates lang/rust to 1.8.0 version (scheduled for April 14, 2016)
OK ? -- Sebastien Marie Index: Makefile =================================================================== RCS file: /cvs/ports/lang/rust/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile 11 Mar 2016 05:30:45 -0000 1.17 +++ Makefile 13 Apr 2016 14:59:59 -0000 @@ -7,10 +7,9 @@ PKG_ARCH-doc = * COMMENT-main = compiler for Rust Language COMMENT-doc = html documentation for rustc -V = 1.7.0 -RUST_HASH = 6a154fe0 +V = 1.8.0 +RUST_HASH = 4fda350b DISTNAME = rustc-${V}-src -REVISION = 0 SUBST_VARS += RUST_HASH @@ -21,7 +20,7 @@ PKGNAME-doc = rust-doc-${V} MULTI_PACKAGES = -main -doc # the snapshot version should be the version in src/snapshots.txt -SNAPSHOT-amd64 = rust-stage0-2015-12-18-3391630-openbsd-x86_64-6c8aab2c8a169274942f9a15e460069a3ff64be9.tar.bz2 +SNAPSHOT-amd64 = rust-stage0-2016-02-17-4d3eebf-openbsd-x86_64-ac957c6b84de2bd67f01df085d9ea515f96e22f3.tar.bz2 CATEGORIES = lang Index: distinfo =================================================================== RCS file: /cvs/ports/lang/rust/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 5 Mar 2016 15:05:33 -0000 1.10 +++ distinfo 13 Apr 2016 14:59:59 -0000 @@ -1,4 +1,4 @@ -SHA256 (rust/rust-stage0-2015-12-18-3391630-openbsd-x86_64-6c8aab2c8a169274942f9a15e460069a3ff64be9.tar.bz2) = 3jwmqTz5USkizAEvm1e9CNe2T34Eaam7Ay+pwHJgzww= -SHA256 (rust/rustc-1.7.0-src.tar.gz) = bflgWdh7cYZ22c2HlnLk4iQYtgkzlrTMtbW2bfN78To= -SIZE (rust/rust-stage0-2015-12-18-3391630-openbsd-x86_64-6c8aab2c8a169274942f9a15e460069a3ff64be9.tar.bz2) = 20717564 -SIZE (rust/rustc-1.7.0-src.tar.gz) = 25097611 +SHA256 (rust/rust-stage0-2016-02-17-4d3eebf-openbsd-x86_64-ac957c6b84de2bd67f01df085d9ea515f96e22f3.tar.bz2) = i8F0iobZwmSIzpidf3f5B2RiMnZjdgVrX4QAsbDF3Wc= +SHA256 (rust/rustc-1.8.0-src.tar.gz) = r0RmFH6NTbTeKkbgdJTS3C2WMTxbN9o0I39RHJBfdEk= +SIZE (rust/rust-stage0-2016-02-17-4d3eebf-openbsd-x86_64-ac957c6b84de2bd67f01df085d9ea515f96e22f3.tar.bz2) = 21379252 +SIZE (rust/rustc-1.8.0-src.tar.gz) = 25641320 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/lang/rust/patches/patch-configure,v retrieving revision 1.8 diff -u -p -r1.8 patch-configure --- patches/patch-configure 11 Mar 2016 05:30:45 -0000 1.8 +++ patches/patch-configure 13 Apr 2016 14:59:59 -0000 @@ -3,8 +3,8 @@ Remove requirement for curl or wget. The snapshot isn't downloaded but copied by post-configure. Remove requirement for FileCheck (LLVM) used in some tests. ---- configure.orig Tue Mar 1 20:18:54 2016 -+++ configure Mon Mar 7 06:07:54 2016 +--- configure.orig Mon Apr 11 23:22:03 2016 ++++ configure Wed Apr 13 10:23:22 2016 @@ -727,7 +727,7 @@ putvar CFG_BOOTSTRAP_KEY step_msg "looking for build programs" @@ -12,9 +12,9 @@ Remove requirement for FileCheck (LLVM) -probe_need CFG_CURLORWGET curl wget +probe CFG_CURLORWGET curl wget 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 -@@ -1495,7 +1495,7 @@ do +@@ -1494,7 +1494,7 @@ do LLVM_INST_DIR=$CFG_LLVM_ROOT do_reconfigure=0 # Check that LLVm FileCheck is available. Needed for the tests Index: patches/patch-src_compiletest_runtest_rs =================================================================== RCS file: /cvs/ports/lang/rust/patches/patch-src_compiletest_runtest_rs,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_compiletest_runtest_rs --- patches/patch-src_compiletest_runtest_rs 11 Mar 2016 05:30:45 -0000 1.1 +++ patches/patch-src_compiletest_runtest_rs 13 Apr 2016 14:59:59 -0000 @@ -1,36 +1,36 @@ $OpenBSD: patch-src_compiletest_runtest_rs,v 1.1 2016/03/11 05:30:45 semarie Exp $ disable this part of test, as FileCheck isn't installed with LLVM ---- src/compiletest/runtest.rs.orig Mon Mar 7 08:17:06 2016 -+++ src/compiletest/runtest.rs Mon Mar 7 09:37:52 2016 -@@ -1685,33 +1685,15 @@ fn compile_test_and_save_ir(config: &Config, props: &T - compose_and_run_compiler(config, props, testfile, args, None) +--- src/compiletest/runtest.rs.orig Mon Apr 11 23:22:03 2016 ++++ src/compiletest/runtest.rs Wed Apr 13 14:08:41 2016 +@@ -1740,33 +1740,15 @@ fn compile_test_and_save_ir(config: &Config, props: &T + compose_and_run_compiler(config, props, testpaths, args, None) } --fn check_ir_with_filecheck(config: &Config, testfile: &Path) -> ProcRes { -- let irfile = output_base_name(config, testfile).with_extension("ll"); +-fn check_ir_with_filecheck(config: &Config, testpaths: &TestPaths) -> ProcRes { +- let irfile = output_base_name(config, testpaths).with_extension("ll"); - let prog = config.llvm_bin_path.as_ref().unwrap().join("FileCheck"); - let proc_args = ProcArgs { - // FIXME (#9639): This needs to handle non-utf8 paths - prog: prog.to_str().unwrap().to_owned(), - args: vec!(format!("-input-file={}", irfile.to_str().unwrap()), -- testfile.to_str().unwrap().to_owned()) +- testpaths.file.to_str().unwrap().to_owned()) - }; -- compose_and_run(config, testfile, proc_args, Vec::new(), "", None, None) +- compose_and_run(config, testpaths, proc_args, Vec::new(), "", None, None) -} - - fn run_codegen_test(config: &Config, props: &TestProps, testfile: &Path) { + fn run_codegen_test(config: &Config, props: &TestProps, testpaths: &TestPaths) { if config.llvm_bin_path.is_none() { fatal("missing --llvm-bin-path"); } -- let mut proc_res = compile_test_and_save_ir(config, props, testfile); -+ let proc_res = compile_test_and_save_ir(config, props, testfile); +- let mut proc_res = compile_test_and_save_ir(config, props, testpaths); ++ let proc_res = compile_test_and_save_ir(config, props, testpaths); if !proc_res.status.success() { fatal_proc_rec("compilation failed!", &proc_res); - } - -- proc_res = check_ir_with_filecheck(config, testfile); +- proc_res = check_ir_with_filecheck(config, testpaths); - if !proc_res.status.success() { - fatal_proc_rec("verification with 'FileCheck' failed", - &proc_res); Index: patches/patch-src_librustc_back_target_x86_64_unknown_openbsd_rs =================================================================== RCS file: patches/patch-src_librustc_back_target_x86_64_unknown_openbsd_rs diff -N patches/patch-src_librustc_back_target_x86_64_unknown_openbsd_rs --- patches/patch-src_librustc_back_target_x86_64_unknown_openbsd_rs 5 Mar 2016 15:05:33 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_librustc_back_target_x86_64_unknown_openbsd_rs,v 1.1 2016/03/05 15:05:33 semarie Exp $ -backport of https://github.com/rust-lang/rust/pull/31727 ---- src/librustc_back/target/x86_64_unknown_openbsd.rs.orig Wed Mar 2 09:28:32 2016 -+++ src/librustc_back/target/x86_64_unknown_openbsd.rs Wed Mar 2 09:28:57 2016 -@@ -12,6 +12,7 @@ use target::Target; - - pub fn target() -> Target { - let mut base = super::openbsd_base::opts(); -+ base.cpu = "x86-64".to_string(); - base.pre_link_args.push("-m64".to_string()); - - Target {