On Fri, 21 Oct 2016 20:14:53 +0200, Sebastien Marie <sema...@online.fr>
wrote:
> Hi,
>
> Here an update for lang/rust.
>
> For release note see
> https://blog.rust-lang.org/2016/10/20/Rust-1.12.1.html. For the full
> change see https://github.com/rust-lang/rust/pull/37173.
>
> Please note I rebuilded the bootstrap due to bug in rustc: 1.12.0
> wasn't able to rebuild 1.12.1 without intrusive patch is build
> system. It should be corrected in next version of rustc, and I
> upgraded the Makefile to try rebuilding when major are same between
> bootstrap and version.
>
> Diff tested with `make test', and by rebuilding devel/cargo.
>
> Thanks.
Updated patch after a make update-patches.
ok danj@ if someone wants to commit it.
Cheers,
Daniel
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 5 Oct 2016 16:48:10 -0000 1.30
+++ Makefile 22 Oct 2016 13:31:30 -0000
@@ -7,12 +7,12 @@ PKG_ARCH-doc = *
COMMENT-main = compiler for Rust Language
COMMENT-doc = html documentation for rustc
-V = 1.12.0
-BV = 1.12.0-20160929
+V = 1.12.1
+BV = 1.12.1-20161021
DISTNAME = rustc-${V}-src
#RUST_HASH != echo -n ${V} | md5 | cut -c1-8
-RUST_HASH = 40393716
+RUST_HASH = 5c6cf767
SUBST_VARS += RUST_HASH
PKGNAME = rust-${V}
@@ -87,8 +87,8 @@ CONFIGURE_ARGS += --disable-valgrind-rpa
--prefix="${LOCALBASE}" \
--mandir="${LOCALBASE}/man"
-# VERSION and BOOTSTRAP are same version
-.if ${V} == ${BV:C/-[0-9]+$//}
+# VERSION and BOOTSTRAP are same major version
+.if ${V:C/\.[0-9]+$//} == ${BV:C/\.[0-9]+-[0-9]+$//}
CONFIGURE_ARGS += --enable-local-rebuild
.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 5 Oct 2016 16:48:10 -0000 1.17
+++ distinfo 22 Oct 2016 13:31:30 -0000
@@ -1,4 +1,4 @@
-SHA256 (rust/rustc-1.12.0-src.tar.gz) = rFkH1vqWwZvVkB2NmTg/uHVRJ1cerT1AcMzpwftfM3o=
-SHA256 (rust/rustc-bootstrap-amd64-1.12.0-20160929.tar.gz) = VjewvFzkgatD8nKLpLmaCtWkRecoNWDNOd3GrdYH42U=
-SIZE (rust/rustc-1.12.0-src.tar.gz) = 27501444
-SIZE (rust/rustc-bootstrap-amd64-1.12.0-20160929.tar.gz) = 24459997
+SHA256 (rust/rustc-1.12.1-src.tar.gz) = l5E65MslVhiqrNGlNLEfNDY0sECzJlYlDQnY2ewC09w=
+SHA256 (rust/rustc-bootstrap-amd64-1.12.1-20161021.tar.gz) = KNG9v6HBcpbf/rr2IaaPkHgjNQ1EwothEswHPdNV4mo=
+SIZE (rust/rustc-1.12.1-src.tar.gz) = 27511443
+SIZE (rust/rustc-bootstrap-amd64-1.12.1-20161021.tar.gz) = 25133752
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/rust/patches/patch-configure,v
retrieving revision 1.12
diff -u -p -r1.12 patch-configure
--- patches/patch-configure 3 Sep 2016 19:51:47 -0000 1.12
+++ patches/patch-configure 22 Oct 2016 13:31:30 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-configure,v 1.12 2016/09/03 19:51:47 naddy Exp $
Remove requirement for curl.
The snapshot isn't downloaded but copied by post-configure.
---- configure.orig Tue Aug 16 03:54:35 2016
-+++ configure Sat Sep 3 13:35:30 2016
-@@ -726,7 +726,7 @@ if [ -n "$CFG_ENABLE_ORBIT" ]; then putvar CFG_ENABLE_
+--- configure.orig Wed Oct 19 23:51:02 2016
++++ configure Sat Oct 22 15:28:15 2016
+@@ -737,7 +737,7 @@ if [ -n "$CFG_DISABLE_ORBIT" ]; then putvar CFG_DISABL
step_msg "looking for build programs"
@@ -12,7 +12,7 @@ The snapshot isn't downloaded but copied
if [ -z "$CFG_PYTHON_PROVIDED" ]; then
probe_need CFG_PYTHON python2.7 python2 python
fi
-@@ -877,7 +877,7 @@ then
+@@ -899,7 +899,7 @@ then
fi
CMD="${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF}"
Index: patches/patch-src_librustdoc_test_rs
===================================================================
RCS file: /cvs/ports/lang/rust/patches/patch-src_librustdoc_test_rs,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_librustdoc_test_rs
--- patches/patch-src_librustdoc_test_rs 31 Aug 2016 08:33:19 -0000 1.3
+++ patches/patch-src_librustdoc_test_rs 22 Oct 2016 13:31:30 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_librustdoc_test_rs,v 1.3 2016/08/31 08:33:19 landry Exp $
fallback to CFG_PREFIX as default sysroot.
---- src/librustdoc/test.rs.orig Tue Aug 16 03:54:35 2016
-+++ src/librustdoc/test.rs Fri Aug 19 06:40:11 2016
+--- src/librustdoc/test.rs.orig Wed Oct 19 23:51:02 2016
++++ src/librustdoc/test.rs Sat Oct 22 15:28:15 2016
@@ -63,9 +63,16 @@ pub fn run(input: &str,
let input_path = PathBuf::from(input);
let input = config::Input::File(input_path.clone());
@@ -21,9 +21,9 @@ fallback to CFG_PREFIX as default sysroo
search_paths: libs.clone(),
crate_types: vec!(config::CrateTypeDylib),
externs: externs.clone(),
-@@ -187,9 +194,16 @@ fn runtest(test: &str, cratename: &str, cfgs: Vec<Stri
- let mut outputs = HashMap::new();
- outputs.insert(OutputType::Exe, None);
+@@ -184,9 +191,16 @@ fn runtest(test: &str, cratename: &str, cfgs: Vec<Stri
+ };
+ let outputs = OutputTypes::new(&[(OutputType::Exe, None)]);
+ let sysroot = match env::current_exe().ok() {
+ Some(mut p) => { p.pop(); p.pop(); p }
Index: patches/patch-src_libstd_sys_unix_os_rs
===================================================================
RCS file: /cvs/ports/lang/rust/patches/patch-src_libstd_sys_unix_os_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_libstd_sys_unix_os_rs
--- patches/patch-src_libstd_sys_unix_os_rs 9 Jun 2016 04:20:10 -0000 1.2
+++ patches/patch-src_libstd_sys_unix_os_rs 22 Oct 2016 13:31:30 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_libstd_sys_unix_os_rs,v 1.2 2016/06/09 04:20:10 semarie Exp $
argv0 isn't suitable as current_exe() in all cases.
---- src/libstd/sys/unix/os.rs.orig Mon May 23 18:29:00 2016
-+++ src/libstd/sys/unix/os.rs Tue Jun 7 17:36:10 2016
-@@ -235,13 +235,14 @@ pub fn current_exe() -> io::Result<PathBuf> {
+--- src/libstd/sys/unix/os.rs.orig Wed Oct 19 23:51:03 2016
++++ src/libstd/sys/unix/os.rs Sat Oct 22 15:28:15 2016
+@@ -246,13 +246,14 @@ pub fn current_exe() -> io::Result<PathBuf> {
argv.set_len(argv_len as usize);
if argv[0].is_null() {
return Err(io::Error::new(io::ErrorKind::Other,
Index: patches/patch-src_test_run-pass_backtrace_rs
===================================================================
RCS file: /cvs/ports/lang/rust/patches/patch-src_test_run-pass_backtrace_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_test_run-pass_backtrace_rs
--- patches/patch-src_test_run-pass_backtrace_rs 31 Aug 2016 08:33:19 -0000 1.2
+++ patches/patch-src_test_run-pass_backtrace_rs 22 Oct 2016 13:31:30 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_test_run-pass_backtrace_rs,v 1.2 2016/08/31 08:33:19 landry Exp $
Skip run-pass/backtrace as libbacktrace is disabled on openbsd.
---- src/test/run-pass/backtrace.rs.orig Mon Jul 4 20:04:09 2016
-+++ src/test/run-pass/backtrace.rs Tue Jul 5 19:01:38 2016
-@@ -115,7 +115,8 @@ fn runtest(me: &str) {
+--- src/test/run-pass/backtrace.rs.orig Wed Oct 19 23:51:03 2016
++++ src/test/run-pass/backtrace.rs Sat Oct 22 15:28:15 2016
+@@ -104,7 +104,8 @@ fn runtest(me: &str) {
}
fn main() {
Index: patches/patch-src_tools_compiletest_src_runtest_rs
===================================================================
RCS file: /cvs/ports/lang/rust/patches/patch-src_tools_compiletest_src_runtest_rs,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_tools_compiletest_src_runtest_rs
--- patches/patch-src_tools_compiletest_src_runtest_rs 31 Aug 2016 08:33:19 -0000 1.1
+++ patches/patch-src_tools_compiletest_src_runtest_rs 22 Oct 2016 13:31:30 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_tools_compiletest_src_runtest_rs,v 1.1 2016/08/31 08:33:19 landry Exp $
use gmake to run-make testsuite
---- src/tools/compiletest/src/runtest.rs.orig Tue Aug 16 03:54:35 2016
-+++ src/tools/compiletest/src/runtest.rs Fri Aug 19 06:40:11 2016
-@@ -2043,7 +2043,7 @@ actual:\n\
+--- src/tools/compiletest/src/runtest.rs.orig Wed Oct 19 23:51:03 2016
++++ src/tools/compiletest/src/runtest.rs Sat Oct 22 15:28:15 2016
+@@ -2056,7 +2056,7 @@ actual:\n\
}
self.create_dir_racy(&tmpdir);
