Re: [update] lang/rust 1.12.1

[Daniel Jakots]

On Fri, 21 Oct 2016 20:14:53 +0200, Sebastien Marie 
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,
DanielIndex: 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 -	1.30
+++ Makefile	22 Oct 2016 13:31:30 -
@@ -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 -	1.17
+++ distinfo	22 Oct 2016 13:31:30 -
@@ -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 -	1.12
+++ patches/patch-configure	22 Oct 2016 13:31:30 -
@@ -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 -	1.3
+++ patches/patch-src_librustdoc_test_rs	22 Oct 2016 13:31:30 -
@@ -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: ,
  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: , cratename: , cfgs: Vec { p.pop(); p.pop(); p }
Index: 

[update] lang/rust 1.12.1

[Sebastien Marie]

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.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile5 Oct 2016 16:48:10 -   1.30
+++ Makefile21 Oct 2016 18:04:17 -
@@ -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
--- distinfo5 Oct 2016 16:48:10 -   1.17
+++ distinfo21 Oct 2016 18:04:17 -
@@ -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