Re: update: lang/rust

[Niklas Hallqvist]

Yes, I sort of agree, but personally I will run with this meanwhile.  I 
now recall what it was that made me do this: wasm. The wasm-pack system 
requires the version of rustc to match with the wasm32-unknown-unknown 
target, and I thought it better (read: easier :-) )to use the published 
target instead of bootstrapping it myself.  Esp. if the only reason is 
to get matching version strings.  As the tarball version is containing 
the githash+date information I thought this was the easiest way.  Call 
me lazy :-) I still had to build rust myself since I wanted 1.39 for 
other reasons.


I won't push for the offical port of yours  to contain this, I just 
wanted to contribute an idea.  Do with it what you like. Maybe I will 
open a ticket with rustc for the tarball to contain the version, it 
makes sense I think.


/Niklas

On 2019-12-12 09:15, Sebastien Marie wrote:

On Thu, Dec 12, 2019 at 07:52:21AM +0100, Niklas Hallqvist wrote:

As a matter of fact I did the same update just a week ago, and ended up in 
exactly the same patch set as you, except for one thing:

The version reported by 'rust -V' normally include the git hash and date, and 
some rust code out there depends on it (maybe dumb, but nevertheless it is).

it is currently expected for build from a tarball. git information is only
included when build from a git directory. so I am expecting that any rust
installed from distribution to share the same output. (but when installed from
rustup, it comes from a build from mozilla which is done using git)

if some rust crate depends on it, you should open a bug report.

it could be interesting to also open a bug report on rustc itself in order to
include the information for tarball too (the tarball contains at least the
commit-hash information).

Thanks.

Re: update: lang/rust

[Sebastien Marie]

On Thu, Dec 12, 2019 at 07:52:21AM +0100, Niklas Hallqvist wrote:
> As a matter of fact I did the same update just a week ago, and ended up in 
> exactly the same patch set as you, except for one thing:
> 
> The version reported by 'rust -V' normally include the git hash and date, and 
> some rust code out there depends on it (maybe dumb, but nevertheless it is).

it is currently expected for build from a tarball. git information is only
included when build from a git directory. so I am expecting that any rust
installed from distribution to share the same output. (but when installed from
rustup, it comes from a build from mozilla which is done using git)

if some rust crate depends on it, you should open a bug report.

it could be interesting to also open a bug report on rustc itself in order to
include the information for tarball too (the tarball contains at least the
commit-hash information).

Thanks.
-- 
Sebastien Marie

Re: update: lang/rust

[Niklas Hallqvist]

As a matter of fact I did the same update just a week ago, and ended up in 
exactly the same patch set as you, except for one thing:

The version reported by 'rust -V' normally include the git hash and date, and 
some rust code out there depends on it (maybe dumb, but nevertheless it is).

I did it by adding to the diff-file for src/bootstrap/lib.rs, but it can 
conceivably instead be a post-patch target patching lib.rs with the contents of 
'git-commit-hash', a file found in the build directory.

/Niklas

diff --git a/lang/rust/patches/patch-src_bootstrap_lib_rs b/lang/rust/patches/p\
atch-src_bootstrap_lib_rs 
index 4ae91048f80..5c8543e5e18 100644 
--- a/lang/rust/patches/patch-src_bootstrap_lib_rs 
+++ b/lang/rust/patches/patch-src_bootstrap_lib_rs 
@@ -12,3 +12,12 @@ Index: src/bootstrap/lib.rs 
 .collect::>(); 
   
  // If we're compiling on macOS then we add a few unconditional flags 
+@@ -1048,7 +1047,7 @@ impl Build { 
+ /// Note that this is a descriptive string which includes the commit date\
, 
+ /// sha, version, etc. 
+ fn rust_version() -> String { 
+-self.rust_info.version(self, channel::CFG_RELEASE_NUM) 
++String::from("1.39.0 (4560ea788 2019-11-04)") 
+ } 
+  
+ /// Returns the full commit hash. 

> On 8 Dec 2019, at 12:30, Sebastien Marie  wrote:
> 
> Hi,
> 
> Here the diff for updating lang/rust to 1.39.0
> 
> The patch took more time than expected to be done: I had problem with sparc64
> and I only achieved to have a workaround in order to avoid a SEGFAULT during 
> the
> build. I am suspecting some LLVM bug in sparc64, as the workaround is to build
> some part of rust with -O3 (else the generated code will SEGFAULT). I didn't
> really investigated at asm level.
> 
> The port was tested some times ago on amd64 (and build tested and all archs).
> 
> I intent to commit it in few days. But comments or OK are welcome :)
> 
> Thanks.
> -- 
> Sebastien Marie
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/rust/Makefile,v
> retrieving revision 1.102
> diff -u -p -r1.102 Makefile
> --- Makefile  29 Sep 2019 08:23:17 -  1.102
> +++ Makefile  8 Dec 2019 10:55:23 -
> @@ -13,17 +13,17 @@ COMMENT-gdb = Rust debugger through gdb
> COMMENT-clippy =  Rust linter
> COMMENT-rustfmt = Rust code formatter
> 
> -V =  1.38.0
> -CARGO_V =0.39.0
> +V =  1.39.0
> +CARGO_V =0.40.0
> CLIPPY_V =0.0.212
> -RUSTFMT_V =  1.4.4
> +RUSTFMT_V =  1.4.8
> DISTNAME =rustc-${V}-src
> 
> # rustc bootstrap version
> -BV-aarch64 = 1.38.0-20190926
> -BV-amd64 =   1.38.0-20190924
> -BV-i386 =1.38.0-20190924
> -BV-sparc64 = 1.37.0-20190813
> +BV-aarch64 = 1.39.0-20191124
> +BV-amd64 =   1.39.0-20191122
> +BV-i386 =1.39.0-20191123
> +BV-sparc64 = 1.39.0-20191207
> BV =  ${BV-${MACHINE_ARCH}}
> 
> PKGNAME = rust-${V}
> @@ -138,7 +138,7 @@ SUBST_VARS += WRKBUILD
> post-patch:
>   sed -i 's/"files":{[^}]*}/"files":{}/' \
>   ${WRKSRC}/vendor/*/.cargo-checksum.json
> - ${SUBST_CMD} ${WRKSRC}/src/tools/cargo/tests/testsuite/support/paths.rs
> + ${SUBST_CMD} 
> ${WRKSRC}/src/tools/cargo/crates/cargo-test-support/src/paths.rs
> 
> # - check datasize limit before configuring (and building)
> pre-configure:
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/rust/distinfo,v
> retrieving revision 1.58
> diff -u -p -r1.58 distinfo
> --- distinfo  29 Sep 2019 08:23:17 -  1.58
> +++ distinfo  8 Dec 2019 10:55:23 -
> @@ -1,10 +1,10 @@
> -SHA256 (rust/rustc-1.38.0-src.tar.xz) = 
> OnmRqky0TvlB1xY25FqVRotSDcb8fPclNkklvT49OjQ=
> -SHA256 (rust/rustc-bootstrap-aarch64-1.38.0-20190926.tar.xz) = 
> K6z7+X02Zw6kzFdt93JoOhVFJmVI1tp2kcV3Ep07i1k=
> -SHA256 (rust/rustc-bootstrap-amd64-1.38.0-20190924.tar.xz) = 
> s7m04Xk4Rukj3of8sLaK2NRiRZoAEEaxeQ14zE7/42U=
> -SHA256 (rust/rustc-bootstrap-i386-1.38.0-20190924.tar.xz) = 
> p7GH8ebq4uh5OUGIK3qbmRoWnotASu9Z6K/nMOLX2Ck=
> -SHA256 (rust/rustc-bootstrap-sparc64-1.37.0-20190813.tar.xz) = 
> Mja3fEVQ6pD9cxq0ZfEX+O6QW+cVLpA9n5k67M6u0gU=
> -SIZE (rust/rustc-1.38.0-src.tar.xz) = 96163304
> -SIZE (rust/rustc-bootstrap-aarch64-1.38.0-20190926.tar.xz) = 179869984
> -SIZE (rust/rustc-bootstrap-amd64-1.38.0-20190924.tar.xz) = 195854424
> -SIZE (rust/rustc-bootstrap-i386-1.38.0-20190924.tar.xz) = 193885292
> -SIZE (rust/rustc-bootstrap-sparc64-1.37.0-20190813.tar.xz) = 77696860
> +SHA256 (rust/rustc-1.39.0-src.tar.xz) = 
> Sw27NWBwaHpgYDT3HcAyt4O7+LXT+f/znywfvE8XHCk=
> +SHA256 (rust/rustc-bootstrap-aarch64-1.39.0-20191124.tar.xz) = 
> d+u86EWh5RRFuzf3NbOkHPV+jT5ySxEkqnOgQgU+w1g=
> +SHA256 (rust/rustc-bootstrap-amd64-1.39.0-20191122.tar.xz) = 
> 

Re: update: lang/rust

[Laurence Tratt]

On Sun, Dec 08, 2019 at 12:30:09PM +0100, Sebastien Marie wrote:

Hello Sebastien,

> Here the diff for updating lang/rust to 1.39.0

This works well for my Rust code. I've also tested all the subpackages
successfully: rustfmt, Clippy, and rust-gdb (I didn't even realise there was
a subpackage for the latter until I looked in the Makefile!). Thanks for
this -- I'm starting to see code which doesn't compile under 1.38 so this is
very useful!


Laurie

Re: update: lang/rust

[Reyk Floeter]

On Sun, Dec 08, 2019 at 12:30:09PM +0100, Sebastien Marie wrote:
> Hi,
> 
> Here the diff for updating lang/rust to 1.39.0
> 
> The patch took more time than expected to be done: I had problem with sparc64
> and I only achieved to have a workaround in order to avoid a SEGFAULT during 
> the
> build. I am suspecting some LLVM bug in sparc64, as the workaround is to build
> some part of rust with -O3 (else the generated code will SEGFAULT). I didn't
> really investigated at asm level.
> 
> The port was tested some times ago on amd64 (and build tested and all archs).
> 
> I intent to commit it in few days. But comments or OK are welcome :)
> 
> Thanks.

Lightly tested - looks good, compiles, and works fine.

- I was using 1.39-beta before (using your build-rust script) and had
  some issues - all of them disappeared with this port (libclang, cargo
  update, clippy, ...).

- Works fine with 1.39 async/await code, for example
  https://crates.io/crates/tokio-libtls v1.1.0

Thanks for your work!  I'm excited to see 1.39 in OpenBSD.

I cannot really judge the ports Makefile,
otherwise OK reyk@

> -- 
> Sebastien Marie
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/rust/Makefile,v
> retrieving revision 1.102
> diff -u -p -r1.102 Makefile
> --- Makefile  29 Sep 2019 08:23:17 -  1.102
> +++ Makefile  8 Dec 2019 10:55:23 -
> @@ -13,17 +13,17 @@ COMMENT-gdb = Rust debugger through gdb
>  COMMENT-clippy = Rust linter
>  COMMENT-rustfmt =Rust code formatter
>  
> -V =  1.38.0
> -CARGO_V =0.39.0
> +V =  1.39.0
> +CARGO_V =0.40.0
>  CLIPPY_V =   0.0.212
> -RUSTFMT_V =  1.4.4
> +RUSTFMT_V =  1.4.8
>  DISTNAME =   rustc-${V}-src
>  
>  # rustc bootstrap version
> -BV-aarch64 = 1.38.0-20190926
> -BV-amd64 =   1.38.0-20190924
> -BV-i386 =1.38.0-20190924
> -BV-sparc64 = 1.37.0-20190813
> +BV-aarch64 = 1.39.0-20191124
> +BV-amd64 =   1.39.0-20191122
> +BV-i386 =1.39.0-20191123
> +BV-sparc64 = 1.39.0-20191207
>  BV = ${BV-${MACHINE_ARCH}}
>  
>  PKGNAME =rust-${V}
> @@ -138,7 +138,7 @@ SUBST_VARS += WRKBUILD
>  post-patch:
>   sed -i 's/"files":{[^}]*}/"files":{}/' \
>   ${WRKSRC}/vendor/*/.cargo-checksum.json
> - ${SUBST_CMD} ${WRKSRC}/src/tools/cargo/tests/testsuite/support/paths.rs
> + ${SUBST_CMD} 
> ${WRKSRC}/src/tools/cargo/crates/cargo-test-support/src/paths.rs
>  
>  # - check datasize limit before configuring (and building)
>  pre-configure:
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/rust/distinfo,v
> retrieving revision 1.58
> diff -u -p -r1.58 distinfo
> --- distinfo  29 Sep 2019 08:23:17 -  1.58
> +++ distinfo  8 Dec 2019 10:55:23 -
> @@ -1,10 +1,10 @@
> -SHA256 (rust/rustc-1.38.0-src.tar.xz) = 
> OnmRqky0TvlB1xY25FqVRotSDcb8fPclNkklvT49OjQ=
> -SHA256 (rust/rustc-bootstrap-aarch64-1.38.0-20190926.tar.xz) = 
> K6z7+X02Zw6kzFdt93JoOhVFJmVI1tp2kcV3Ep07i1k=
> -SHA256 (rust/rustc-bootstrap-amd64-1.38.0-20190924.tar.xz) = 
> s7m04Xk4Rukj3of8sLaK2NRiRZoAEEaxeQ14zE7/42U=
> -SHA256 (rust/rustc-bootstrap-i386-1.38.0-20190924.tar.xz) = 
> p7GH8ebq4uh5OUGIK3qbmRoWnotASu9Z6K/nMOLX2Ck=
> -SHA256 (rust/rustc-bootstrap-sparc64-1.37.0-20190813.tar.xz) = 
> Mja3fEVQ6pD9cxq0ZfEX+O6QW+cVLpA9n5k67M6u0gU=
> -SIZE (rust/rustc-1.38.0-src.tar.xz) = 96163304
> -SIZE (rust/rustc-bootstrap-aarch64-1.38.0-20190926.tar.xz) = 179869984
> -SIZE (rust/rustc-bootstrap-amd64-1.38.0-20190924.tar.xz) = 195854424
> -SIZE (rust/rustc-bootstrap-i386-1.38.0-20190924.tar.xz) = 193885292
> -SIZE (rust/rustc-bootstrap-sparc64-1.37.0-20190813.tar.xz) = 77696860
> +SHA256 (rust/rustc-1.39.0-src.tar.xz) = 
> Sw27NWBwaHpgYDT3HcAyt4O7+LXT+f/znywfvE8XHCk=
> +SHA256 (rust/rustc-bootstrap-aarch64-1.39.0-20191124.tar.xz) = 
> d+u86EWh5RRFuzf3NbOkHPV+jT5ySxEkqnOgQgU+w1g=
> +SHA256 (rust/rustc-bootstrap-amd64-1.39.0-20191122.tar.xz) = 
> SKh/PBPnJkPT489dOjhwwVemVEOA/UL5rOzmXWjCw84=
> +SHA256 (rust/rustc-bootstrap-i386-1.39.0-20191123.tar.xz) = 
> rbXw6X+yJdoinB56eCQPkg6k8o1SJiUl4yzcnPr2Als=
> +SHA256 (rust/rustc-bootstrap-sparc64-1.39.0-20191207.tar.xz) = 
> zbSeowzoJp2uhgnIcmOHiLXTZTlsXa0SGS8pm77zyaw=
> +SIZE (rust/rustc-1.39.0-src.tar.xz) = 96495140
> +SIZE (rust/rustc-bootstrap-aarch64-1.39.0-20191124.tar.xz) = 182606628
> +SIZE (rust/rustc-bootstrap-amd64-1.39.0-20191122.tar.xz) = 198744372
> +SIZE (rust/rustc-bootstrap-i386-1.39.0-20191123.tar.xz) = 198502860
> +SIZE (rust/rustc-bootstrap-sparc64-1.39.0-20191207.tar.xz) = 225734860
> Index: patches/patch-src_bootstrap_bin_rustc_rs
> ===
> RCS file: /cvs/ports/lang/rust/patches/patch-src_bootstrap_bin_rustc_rs,v
> retrieving revision 1.12
> diff -u -p 

update: lang/rust

[Sebastien Marie]

Hi,

Here the diff for updating lang/rust to 1.39.0

The patch took more time than expected to be done: I had problem with sparc64
and I only achieved to have a workaround in order to avoid a SEGFAULT during the
build. I am suspecting some LLVM bug in sparc64, as the workaround is to build
some part of rust with -O3 (else the generated code will SEGFAULT). I didn't
really investigated at asm level.

The port was tested some times ago on amd64 (and build tested and all archs).

I intent to commit it in few days. But comments or OK are welcome :)

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile
--- Makefile29 Sep 2019 08:23:17 -  1.102
+++ Makefile8 Dec 2019 10:55:23 -
@@ -13,17 +13,17 @@ COMMENT-gdb =   Rust debugger through gdb
 COMMENT-clippy =   Rust linter
 COMMENT-rustfmt =  Rust code formatter
 
-V =1.38.0
-CARGO_V =  0.39.0
+V =1.39.0
+CARGO_V =  0.40.0
 CLIPPY_V = 0.0.212
-RUSTFMT_V =1.4.4
+RUSTFMT_V =1.4.8
 DISTNAME = rustc-${V}-src
 
 # rustc bootstrap version
-BV-aarch64 =   1.38.0-20190926
-BV-amd64 = 1.38.0-20190924
-BV-i386 =  1.38.0-20190924
-BV-sparc64 =   1.37.0-20190813
+BV-aarch64 =   1.39.0-20191124
+BV-amd64 = 1.39.0-20191122
+BV-i386 =  1.39.0-20191123
+BV-sparc64 =   1.39.0-20191207
 BV =   ${BV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
@@ -138,7 +138,7 @@ SUBST_VARS +=   WRKBUILD
 post-patch:
sed -i 's/"files":{[^}]*}/"files":{}/' \
${WRKSRC}/vendor/*/.cargo-checksum.json
-   ${SUBST_CMD} ${WRKSRC}/src/tools/cargo/tests/testsuite/support/paths.rs
+   ${SUBST_CMD} 
${WRKSRC}/src/tools/cargo/crates/cargo-test-support/src/paths.rs
 
 # - check datasize limit before configuring (and building)
 pre-configure:
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.58
diff -u -p -r1.58 distinfo
--- distinfo29 Sep 2019 08:23:17 -  1.58
+++ distinfo8 Dec 2019 10:55:23 -
@@ -1,10 +1,10 @@
-SHA256 (rust/rustc-1.38.0-src.tar.xz) = 
OnmRqky0TvlB1xY25FqVRotSDcb8fPclNkklvT49OjQ=
-SHA256 (rust/rustc-bootstrap-aarch64-1.38.0-20190926.tar.xz) = 
K6z7+X02Zw6kzFdt93JoOhVFJmVI1tp2kcV3Ep07i1k=
-SHA256 (rust/rustc-bootstrap-amd64-1.38.0-20190924.tar.xz) = 
s7m04Xk4Rukj3of8sLaK2NRiRZoAEEaxeQ14zE7/42U=
-SHA256 (rust/rustc-bootstrap-i386-1.38.0-20190924.tar.xz) = 
p7GH8ebq4uh5OUGIK3qbmRoWnotASu9Z6K/nMOLX2Ck=
-SHA256 (rust/rustc-bootstrap-sparc64-1.37.0-20190813.tar.xz) = 
Mja3fEVQ6pD9cxq0ZfEX+O6QW+cVLpA9n5k67M6u0gU=
-SIZE (rust/rustc-1.38.0-src.tar.xz) = 96163304
-SIZE (rust/rustc-bootstrap-aarch64-1.38.0-20190926.tar.xz) = 179869984
-SIZE (rust/rustc-bootstrap-amd64-1.38.0-20190924.tar.xz) = 195854424
-SIZE (rust/rustc-bootstrap-i386-1.38.0-20190924.tar.xz) = 193885292
-SIZE (rust/rustc-bootstrap-sparc64-1.37.0-20190813.tar.xz) = 77696860
+SHA256 (rust/rustc-1.39.0-src.tar.xz) = 
Sw27NWBwaHpgYDT3HcAyt4O7+LXT+f/znywfvE8XHCk=
+SHA256 (rust/rustc-bootstrap-aarch64-1.39.0-20191124.tar.xz) = 
d+u86EWh5RRFuzf3NbOkHPV+jT5ySxEkqnOgQgU+w1g=
+SHA256 (rust/rustc-bootstrap-amd64-1.39.0-20191122.tar.xz) = 
SKh/PBPnJkPT489dOjhwwVemVEOA/UL5rOzmXWjCw84=
+SHA256 (rust/rustc-bootstrap-i386-1.39.0-20191123.tar.xz) = 
rbXw6X+yJdoinB56eCQPkg6k8o1SJiUl4yzcnPr2Als=
+SHA256 (rust/rustc-bootstrap-sparc64-1.39.0-20191207.tar.xz) = 
zbSeowzoJp2uhgnIcmOHiLXTZTlsXa0SGS8pm77zyaw=
+SIZE (rust/rustc-1.39.0-src.tar.xz) = 96495140
+SIZE (rust/rustc-bootstrap-aarch64-1.39.0-20191124.tar.xz) = 182606628
+SIZE (rust/rustc-bootstrap-amd64-1.39.0-20191122.tar.xz) = 198744372
+SIZE (rust/rustc-bootstrap-i386-1.39.0-20191123.tar.xz) = 198502860
+SIZE (rust/rustc-bootstrap-sparc64-1.39.0-20191207.tar.xz) = 225734860
Index: patches/patch-src_bootstrap_bin_rustc_rs
===
RCS file: /cvs/ports/lang/rust/patches/patch-src_bootstrap_bin_rustc_rs,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_bootstrap_bin_rustc_rs
--- patches/patch-src_bootstrap_bin_rustc_rs29 Sep 2019 08:23:17 -  
1.12
+++ patches/patch-src_bootstrap_bin_rustc_rs8 Dec 2019 10:55:23 -
@@ -4,15 +4,16 @@ try to reduce memory usage on aarch64:
 Index: src/bootstrap/bin/rustc.rs
 --- src/bootstrap/bin/rustc.rs.orig
 +++ src/bootstrap/bin/rustc.rs
-@@ -222,6 +222,11 @@ fn main() {
- cmd.arg("-C").arg(format!("codegen-units={}", s));
- }
+@@ -113,6 +113,12 @@ fn main() {
+ Err(..) => "n",
+ };
  
-+if target.contains("aarch64-unknown-openbsd")
++if 

Re: [patch] update lang/rust to 1.37.0

[Jeremie Courreges-Anglas]

On Thu, Aug 15 2019, Sebastien Marie  wrote:
> Hi,
>
> The following diff updates lang/rust to 1.37.0.
>
> Announce: https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
> Changelog: 
> https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1370-2019-08-15
>
> The diff has been built on amd64, i386, aarch64 and sparc64. It has been
> tested on amd64 (testsuite and all direct dependencies).
>
> The port includes support for sparc64. The support is as complete than
> for others Rust sparc64 targets. Some parts of the ABI are still missing
> (like passing small struct by value with double), but it is enough to
> build rustc itself.
>
> I intent to commit it with sparc64 marked as BROKEN for now. If
> lang/rust itself build is fine, all ports depending on lang/rust will
> need few adjustements: for the moment, there is no published Rust
> libc with openbsd-unknown-sparc64 support. So as it, it would just be
> annoying for sparc64 porters.
>
> Thanks.

Woah, nice!  100% ok to put sparc64 support in the tree so you can work
on it as you see fit.  I can't do more testing than you already did on
amd64.

Please see below,

> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/rust/Makefile,v
> retrieving revision 1.99
> diff -u -p -r1.99 Makefile
> --- Makefile  9 Jul 2019 11:24:28 -   1.99
> +++ Makefile  15 Aug 2019 17:13:14 -
> @@ -1,6 +1,6 @@
>  # $OpenBSD: Makefile,v 1.99 2019/07/09 11:24:28 semarie Exp $
>  
> -ONLY_FOR_ARCHS = ${RUST_ARCHS}
> +ONLY_FOR_ARCHS = ${RUST_ARCHS} sparc64
>  
>  .if "${MACHINE_ARCH}" == "i386"
>  DPB_PROPERTIES = lonesome
> @@ -13,16 +13,17 @@ COMMENT-gdb = Rust debugger through gdb
>  COMMENT-clippy = Rust linter
>  COMMENT-rustfmt =Rust code formatter
>  
> -V =  1.36.0
> -CARGO_V =0.37.0
> +V =  1.37.0
> +CARGO_V =0.38.0
>  CLIPPY_V =   0.0.212
> -RUSTFMT_V =  1.2.2
> +RUSTFMT_V =  1.3.0
>  DISTNAME =   rustc-${V}-src
>  
>  # rustc bootstrap version
> -BV-aarch64 = 1.36.0-20190703
> -BV-amd64 =   1.36.0-20190630
> -BV-i386 =1.36.0-20190630
> +BV-aarch64 = 1.37.0-20190815
> +BV-amd64 =   1.37.0-20190813
> +BV-i386 =1.37.0-20190813
> +BV-sparc64 = 1.37.0-20190813
>  BV = ${BV-${MACHINE_ARCH}}
>  
>  PKGNAME =rust-${V}
> @@ -47,9 +48,6 @@ WANTLIB-gdb =
>  WANTLIB-clippy = c c++abi m pthread
>  WANTLIB-rustfmt =c c++abi m pthread
>  
> -# XXX should this actually just be ports-clang?
> -COMPILER =   base-clang
> -
>  MASTER_SITES =   https://static.rust-lang.org/dist/ \
>   https://dev-static.rust-lang.org/dist/
>  MASTER_SITES0 =  http://kapouay.odns.fr/pub/rust/
> @@ -73,6 +71,15 @@ BOOTSTRAP-$m = rustc-bootstrap-${m}-${B
>  SUPDISTFILES +=  ${BOOTSTRAP-$m}
>  .endfor
>  
> +.if ${PROPERTIES:Mclang}
> +# on arches where the base compiler is clang.
> +# base-clang or ports-clang should be fine: we need devel/llvm only for libs
> +COMPILER =   base-clang
> +.else
> +# use ports-gcc as llvm libraries depends on libestdc++.so and libgcc.a
> +COMPILER =   ports-gcc
> +.endif
> +

Looks like this should just be

  COMPILER =base-clang ports-gcc

While here, could you please move COMPILER right before MODULES, like in
Makefile.template?

[...]



-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

[patch] update lang/rust to 1.37.0

[Sebastien Marie]

Hi,

The following diff updates lang/rust to 1.37.0.

Announce: https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
Changelog: 
https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1370-2019-08-15

The diff has been built on amd64, i386, aarch64 and sparc64. It has been
tested on amd64 (testsuite and all direct dependencies).

The port includes support for sparc64. The support is as complete than
for others Rust sparc64 targets. Some parts of the ABI are still missing
(like passing small struct by value with double), but it is enough to
build rustc itself.

I intent to commit it with sparc64 marked as BROKEN for now. If
lang/rust itself build is fine, all ports depending on lang/rust will
need few adjustements: for the moment, there is no published Rust
libc with openbsd-unknown-sparc64 support. So as it, it would just be
annoying for sparc64 porters.

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.99
diff -u -p -r1.99 Makefile
--- Makefile9 Jul 2019 11:24:28 -   1.99
+++ Makefile15 Aug 2019 17:13:14 -
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile,v 1.99 2019/07/09 11:24:28 semarie Exp $
 
-ONLY_FOR_ARCHS =   ${RUST_ARCHS}
+ONLY_FOR_ARCHS =   ${RUST_ARCHS} sparc64
 
 .if "${MACHINE_ARCH}" == "i386"
 DPB_PROPERTIES =   lonesome
@@ -13,16 +13,17 @@ COMMENT-gdb =   Rust debugger through gdb
 COMMENT-clippy =   Rust linter
 COMMENT-rustfmt =  Rust code formatter
 
-V =1.36.0
-CARGO_V =  0.37.0
+V =1.37.0
+CARGO_V =  0.38.0
 CLIPPY_V = 0.0.212
-RUSTFMT_V =1.2.2
+RUSTFMT_V =1.3.0
 DISTNAME = rustc-${V}-src
 
 # rustc bootstrap version
-BV-aarch64 =   1.36.0-20190703
-BV-amd64 = 1.36.0-20190630
-BV-i386 =  1.36.0-20190630
+BV-aarch64 =   1.37.0-20190815
+BV-amd64 = 1.37.0-20190813
+BV-i386 =  1.37.0-20190813
+BV-sparc64 =   1.37.0-20190813
 BV =   ${BV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
@@ -47,9 +48,6 @@ WANTLIB-gdb =
 WANTLIB-clippy =   c c++abi m pthread
 WANTLIB-rustfmt =  c c++abi m pthread
 
-# XXX should this actually just be ports-clang?
-COMPILER = base-clang
-
 MASTER_SITES = https://static.rust-lang.org/dist/ \
https://dev-static.rust-lang.org/dist/
 MASTER_SITES0 =http://kapouay.odns.fr/pub/rust/
@@ -73,6 +71,15 @@ BOOTSTRAP-$m =   rustc-bootstrap-${m}-${B
 SUPDISTFILES +=${BOOTSTRAP-$m}
 .endfor
 
+.if ${PROPERTIES:Mclang}
+# on arches where the base compiler is clang.
+# base-clang or ports-clang should be fine: we need devel/llvm only for libs
+COMPILER = base-clang
+.else
+# use ports-gcc as llvm libraries depends on libestdc++.so and libgcc.a
+COMPILER = ports-gcc
+.endif
+
 # per MACHINE_ARCH configuration
 .if "${MACHINE_ARCH}" == "aarch64"
 TRIPLE_ARCH =  aarch64-unknown-openbsd
@@ -80,6 +87,8 @@ TRIPLE_ARCH = aarch64-unknown-openbsd
 TRIPLE_ARCH =  x86_64-unknown-openbsd
 .elif "${MACHINE_ARCH}" == "i386"
 TRIPLE_ARCH =  i686-unknown-openbsd
+.elif "${MACHINE_ARCH}" == "sparc64"
+TRIPLE_ARCH =  sparc64-unknown-openbsd
 .endif
 
 SUBST_VARS +=  TRIPLE_ARCH \
@@ -95,7 +104,8 @@ BUILD_DEPENDS += devel/llvm
 BUILD_DEPENDS +=   devel/ninja
 BUILD_DEPENDS +=   devel/gdb
 
-LIB_DEPENDS-main +=devel/libgit2/libgit2 \
+LIB_DEPENDS-main +=${LIB_DEPENDS} \
+   devel/libgit2/libgit2 \
net/curl \
security/libssh2
 
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.56
diff -u -p -r1.56 distinfo
--- distinfo9 Jul 2019 11:24:28 -   1.56
+++ distinfo15 Aug 2019 17:13:14 -
@@ -1,8 +1,10 @@
-SHA256 (rust/rustc-1.36.0-src.tar.xz) = 
9RZFufeHr0pdlNsX9q852wxVmA7ST+NmytVbV5APjy0=
-SHA256 (rust/rustc-bootstrap-aarch64-1.36.0-20190703.tar.xz) = 
VUvrX8fiby+cXgSEBlFx6p9kYRM9DmxCsciiZJpQ2uA=
-SHA256 (rust/rustc-bootstrap-amd64-1.36.0-20190630.tar.xz) = 
mgUi57Y+vyPgpEVsbwtO7ELxbIAx3CiqRSHaiRcHwIY=
-SHA256 (rust/rustc-bootstrap-i386-1.36.0-20190630.tar.xz) = 
DjrErwWbFRum9dECCdzVD91X4lSUEeKQnoT3D+m1yFA=
-SIZE (rust/rustc-1.36.0-src.tar.xz) = 98707920
-SIZE (rust/rustc-bootstrap-aarch64-1.36.0-20190703.tar.xz) = 77398988
-SIZE (rust/rustc-bootstrap-amd64-1.36.0-20190630.tar.xz) = 86432540
-SIZE (rust/rustc-bootstrap-i386-1.36.0-20190630.tar.xz) = 85108584
+SHA256 (rust/rustc-1.37.0-src.tar.xz) = 
EKv/rFCnKc90zvbdAxk6L0ZHVBvRnukoG+nlsSyozf0=
+SHA256 (rust/rustc-bootstrap-aarch64-1.37.0-20190815.tar.xz) = 
ik8Zjtsu2h1taeTMFrbSJ2j9L2ww1iMRKrTvsJBuAkI=

Re: update: lang/rust 1.29.1 (security)

[Sebastien Marie]

On Wed, Sep 26, 2018 at 02:13:47PM +0200, Sebastien Marie wrote:
> On Tue, Sep 25, 2018 at 04:53:54PM +0100, Stuart Henderson wrote:
> > > 
> > > A possible way could be:
> > > - having a sub-package -libstd on lang/rust (which would be empty or 
> > > almost)
> > > - add RUN_DEPENDS+=lang/rust,-libstd to port using rustc
> > > 
> > > when lang/rust is updated, the subpackage rust-libstd will automatically
> > > crank, and so the signature of packages with RUN_DEPENDS will change,
> > > and pkg_add -u will update. Does it make sens ? The drawback would be to
> > > manually maintain the RUN_DEPENDS, but it is low overhead and one-time
> > > only.
> > 
> > This would work, it feels a little 'dirty' but not too bad. There's a
> > similar problem in lang/go fwiw. If this is done via RUN_DEPENDS,
> > then PKGSPEC can be used to force updates when needed, without having
> > to bump dependent ports.
> > 
> > But for the immediate case, just bumping them makes sense for now,
> > I don't think we'll have time for anything more complex.
> > 
> 
> The following diff tries to implement it.
> 
> Several parts:
> - new subpackage lang/rust,-staticlib (with empty PLIST)
> 
> - module devel/cargo will add (by default, but it is overridable)
>   RUN_DEPENDS += lang/rust,-staticlib
> 
> - for ports not using the module add an explicit RUN_DEPENDS
> 
> - every impacted port (directly by RUN_DEPENDS addition or indirectly
>   by devel/cargo usage) is bumped
> 
> I did a quick test with ripgrep. When I modify lang/rust version (with
> REVISION++), the packaging of ripgrep seems to correctly incoporate the
> change:
> 
>   ===>  Building package for ripgrep-0.8.1p2
>   Create 
> /home/semarie/repos/openbsd/ports/packages/amd64/all/ripgrep-0.8.1p2.tgz
>   Creating package ripgrep-0.8.1p2
>   /home/semarie/repos/openbsd/ports/plist/amd64/ripgrep-0.8.1p2 was 
> updated
>   lang/rust,-staticlib:rust-staticlib-*:rust-staticlib-1.29.1p0 -> 
> lang/rust,-staticlib:rust-staticlib-*:rust-staticlib-1.29.1p1
>   Link to 
> /home/semarie/repos/openbsd/ports/packages/amd64/ftp/ripgrep-0.8.1p2.tgz
>   Link to 
> /home/semarie/repos/openbsd/ports/packages/amd64/cdrom/ripgrep-0.8.1p2.tgz
> 

After thought, I think it shouldn't be commited as it.
So the diff is mostly for "demonstration" that it should work.

A proper fix would be to have a STATICLIB_DEPENDS and lets the
infrastructure to make it part of the signature, without the need of a
empty package. And we could add it gradually in ports.

For lang/rust, it would STATICLIB_DEPENDS to devel/llvm, as it uses
libLLVM.a and its compoments. So a change on devel/llvm would be noticed,
and the Rust compiler updated.

I think it could have value in several area. But it is too late for 6.4
anyway. So we have time to think about it.

Thanks.
-- 
Sebastien Marie

Re: update: lang/rust 1.29.1 (security)

[Sebastien Marie]

On Tue, Sep 25, 2018 at 04:53:54PM +0100, Stuart Henderson wrote:
> > 
> > A possible way could be:
> > - having a sub-package -libstd on lang/rust (which would be empty or almost)
> > - add RUN_DEPENDS+=lang/rust,-libstd to port using rustc
> > 
> > when lang/rust is updated, the subpackage rust-libstd will automatically
> > crank, and so the signature of packages with RUN_DEPENDS will change,
> > and pkg_add -u will update. Does it make sens ? The drawback would be to
> > manually maintain the RUN_DEPENDS, but it is low overhead and one-time
> > only.
> 
> This would work, it feels a little 'dirty' but not too bad. There's a
> similar problem in lang/go fwiw. If this is done via RUN_DEPENDS,
> then PKGSPEC can be used to force updates when needed, without having
> to bump dependent ports.
> 
> But for the immediate case, just bumping them makes sense for now,
> I don't think we'll have time for anything more complex.
> 

The following diff tries to implement it.

Several parts:
- new subpackage lang/rust,-staticlib (with empty PLIST)

- module devel/cargo will add (by default, but it is overridable)
  RUN_DEPENDS += lang/rust,-staticlib

- for ports not using the module add an explicit RUN_DEPENDS

- every impacted port (directly by RUN_DEPENDS addition or indirectly
  by devel/cargo usage) is bumped

I did a quick test with ripgrep. When I modify lang/rust version (with
REVISION++), the packaging of ripgrep seems to correctly incoporate the
change:

===>  Building package for ripgrep-0.8.1p2
Create 
/home/semarie/repos/openbsd/ports/packages/amd64/all/ripgrep-0.8.1p2.tgz
Creating package ripgrep-0.8.1p2
/home/semarie/repos/openbsd/ports/plist/amd64/ripgrep-0.8.1p2 was 
updated
lang/rust,-staticlib:rust-staticlib-*:rust-staticlib-1.29.1p0 -> 
lang/rust,-staticlib:rust-staticlib-*:rust-staticlib-1.29.1p1
Link to 
/home/semarie/repos/openbsd/ports/packages/amd64/ftp/ripgrep-0.8.1p2.tgz
Link to 
/home/semarie/repos/openbsd/ports/packages/amd64/cdrom/ripgrep-0.8.1p2.tgz

Thanks
-- 
Sebastien Marie


Index: devel/cbindgen/Makefile
===
RCS file: /cvs/ports/devel/cbindgen/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/cbindgen/Makefile 25 Sep 2018 21:16:37 -  1.4
+++ devel/cbindgen/Makefile 26 Sep 2018 12:00:37 -
@@ -5,7 +5,7 @@ COMMENT =   C bindings generator from rus
 GH_ACCOUNT =   eqrion
 GH_PROJECT =   cbindgen
 GH_TAGNAME =   v0.6.3
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   devel
 
Index: textproc/ripgrep/Makefile
===
RCS file: /cvs/ports/textproc/ripgrep/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- textproc/ripgrep/Makefile   25 Sep 2018 21:16:37 -  1.10
+++ textproc/ripgrep/Makefile   26 Sep 2018 12:00:41 -
@@ -5,7 +5,7 @@ COMMENT =   line oriented search tool usi
 GH_ACCOUNT =   BurntSushi
 GH_PROJECT =   ripgrep
 GH_TAGNAME =   0.8.1
-REVISION = 1
+REVISION = 2
 
 CATEGORIES =   textproc sysutils
 
Index: www/firefox-esr/Makefile
===
RCS file: /cvs/ports/www/firefox-esr/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- www/firefox-esr/Makefile25 Sep 2018 21:16:37 -  1.82
+++ www/firefox-esr/Makefile26 Sep 2018 11:37:53 -
@@ -7,7 +7,7 @@ MOZILLA_VERSION =   60.2.1esr
 MOZILLA_BRANCH =   release
 MOZILLA_PROJECT =  firefox
 MOZILLA_CODENAME = browser
-REVISION = 0
+REVISION = 1
 
 WRKDIST =  ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/esr//}
 HOMEPAGE = https://www.mozilla.org/firefox/organizations/
@@ -43,6 +43,8 @@ MOZILLA_USE_BUNDLED_HUNSPELL = Yes
 BUILD_DEPENDS +=   lang/rust
 # stylo build needs LLVM
 BUILD_DEPENDS +=   devel/llvm
+
+RUN_DEPENDS += lang/rust,-staticlib
 
 WANTLIB += X11-xcb Xcursor Xi fribidi intl xcb xcb-shm ${COMPILER_LIBCXX}
 
Index: www/mozilla-firefox/Makefile
===
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.361
diff -u -p -r1.361 Makefile
--- www/mozilla-firefox/Makefile25 Sep 2018 21:16:37 -  1.361
+++ www/mozilla-firefox/Makefile26 Sep 2018 11:38:26 -
@@ -9,7 +9,7 @@ MOZILLA_VERSION =   62.0.2
 MOZILLA_BRANCH =   release
 MOZILLA_PROJECT =  firefox
 MOZILLA_CODENAME = browser
-REVISION = 0
+REVISION = 1
 
 WRKDIST =  ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/b[0-9]*//}
 HOMEPAGE = https://www.mozilla.org/firefox/
@@ -48,6 +48,8 @@ BUILD_DEPENDS +=  lang/rust
 BUILD_DEPENDS +=   devel/llvm
 # 61 requires both versions of 

Re: update: lang/rust 1.29.1 (security)

[Stuart Henderson]

On 2018/09/25 16:50, Sebastien Marie wrote:
> On Mon, Sep 24, 2018 at 09:20:34PM +0100, Stuart Henderson wrote:
> > On 2018/09/24 09:04, Sebastien Marie wrote:
> > > Hi,
> > > 
> > > Here an update for lang/rust 1.29.1.
> > > 
> > > It is a security update (only -current is affected).
> > 
> > Hi, I'm wondering if we need to bump REVISION for ports built with rust
> > (firefox, librsvg, etc) to ensure that they're updated for people running
> > pkg_add -u?
> > 
> 
> At first stance, I thought rust would be part of the signature and so
> packages will update "themself". But after checking, I think you are
> right.
> 
> lang/rust is a BUILD_DEPENDS, and if programs uses code from the Rust
> libstd, the code will be statically compiled in the binary. So it isn't
> part of the signature.
> 
> $ PKG_PATH=cdn.openbsd.org pkg_info -S librsvg-2.44.3
> Information for 
> http://cdn.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/librsvg-2.44.3.tgz
> 
> Signature: 
> librsvg-2.44.3,0,@gdk-pixbuf-2.36.12,@libcroco-0.6.12,@libxml-2.9.8p0,@pango-1.42.4,X11.16.1,Xext.13.0,Xrender.6.0,c.92.5,cairo.13.0,croco-0.6.4.0,expat.12.0,ffi.1.2,fontconfig.12.0,freetype.29.0,fribidi.3.0,gdk_pixbuf-2.0.3200.1,gio-2.0.4200.7,glib-2.0.4201.0,gmodule-2.0.4200.7,gobject-2.0.4200.7,graphite2.2.0,gthread-2.0.4200.7,harfbuzz.12.1,iconv.6.0,intl.6.0,lzma.2.1,m.10.1,pango-1.0.3800.2,pangocairo-1.0.3800.1,pangoft2-1.0.3800.1,pcre.3.0,pixman-1.32.6,png.17.5,pthread.25.1,xcb-render.1.1,xcb-shm.1.1,xcb.4.0,xml2.16.1,z.5.0
> 
> Does it exists a way in ports infrastructure to add such 'fake' dependency
> to trigger a signature change ?
> 
> A possible way could be:
> - having a sub-package -libstd on lang/rust (which would be empty or almost)
> - add RUN_DEPENDS+=lang/rust,-libstd to port using rustc
> 
> when lang/rust is updated, the subpackage rust-libstd will automatically
> crank, and so the signature of packages with RUN_DEPENDS will change,
> and pkg_add -u will update. Does it make sens ? The drawback would be to
> manually maintain the RUN_DEPENDS, but it is low overhead and one-time
> only.

This would work, it feels a little 'dirty' but not too bad. There's a
similar problem in lang/go fwiw. If this is done via RUN_DEPENDS,
then PKGSPEC can be used to force updates when needed, without having
to bump dependent ports.

But for the immediate case, just bumping them makes sense for now,
I don't think we'll have time for anything more complex.

Re: update: lang/rust 1.29.1 (security)

[Stuart Henderson]

On 2018/09/24 09:04, Sebastien Marie wrote:
> Hi,
> 
> Here an update for lang/rust 1.29.1.
> 
> It is a security update (only -current is affected).

Hi, I'm wondering if we need to bump REVISION for ports built with rust
(firefox, librsvg, etc) to ensure that they're updated for people running
pkg_add -u?

update: lang/rust 1.29.1 (security)

[Sebastien Marie]

Hi,

Here an update for lang/rust 1.29.1.

It is a security update (only -current is affected).

ChangeLog: 
https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1291-2018-09-25

The standard library's str::repeat function contained an out of
bounds write caused by an integer overflow. This has been fixed
by deterministically panicking when an overflow happens.

Commit: 
https://github.com/rust-lang/rust/commit/1b94b84ad0143ea2039610e3aec9e929a8a20733

This commit fixes a buffer overflow issue in the standard
library discovered by Scott McMurray where if a large number was
passed to `str::repeat` it may cause and out of bounds write to
the buffer of a `Vec`.  This bug was accidentally introduced in
#48657 when optimizing the `str::repeat` function. The bug
affects stable Rust releases 1.26.0 to 1.29.0. We plan on
backporting this fix to create a 1.29.1 release, and the 1.30.0
release onwards will include this fix.

The fix in this commit is to introduce a deterministic panic in
the case of capacity overflow. When repeating a slice where the
resulting length is larger than the address space, there’s no
way it can succeed anyway!

The standard library and surrounding libraries were briefly
checked to see if there were othere instances of preallocating a
vector with a calculation that may overflow. No instances of
this bug (out of bounds write due to a calculation overflow)
were found at this time.

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- Makefile16 Sep 2018 16:35:27 -  1.79
+++ Makefile21 Sep 2018 06:31:29 -
@@ -11,7 +11,7 @@ DPB_PROPERTIES =  parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.29.0
+V =1.29.1
 CARGO_V =  0.30.0
 DISTNAME = rustc-${V}-src
 
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.41
diff -u -p -r1.41 distinfo
--- distinfo16 Sep 2018 16:35:27 -  1.41
+++ distinfo21 Sep 2018 06:31:29 -
@@ -1,8 +1,8 @@
-SHA256 (rust/rustc-1.29.0-src.tar.xz) = 
OUPamPtHijNu3nQE5C/3bva6T8K4IBLPzNa5/EvSwZE=
+SHA256 (rust/rustc-1.29.1-src.tar.xz) = 
TQ1kxgVh6orMAbhm9I5CyQa2AhXEP/fXsIjuIb3NgT4=
 SHA256 (rust/rustc-bootstrap-aarch64-1.29.0-20180915.tar.xz) = 
7NYZqMGOys36uBFHKQL58p2/wOoTRTTRMy3gX9SnKt0=
 SHA256 (rust/rustc-bootstrap-amd64-1.29.0-20180911.tar.xz) = 
YcAkfJEeYS+aiZmlsHpPt9DVkzZdPDwd1WVmAu6fEYQ=
 SHA256 (rust/rustc-bootstrap-i386-1.29.0-20180911.tar.xz) = 
gEMsLM4E74wBMDsddGHu7nXcufTCY5i8B6w89q+TXhI=
-SIZE (rust/rustc-1.29.0-src.tar.xz) = 61938668
+SIZE (rust/rustc-1.29.1-src.tar.xz) = 61937676
 SIZE (rust/rustc-bootstrap-aarch64-1.29.0-20180915.tar.xz) = 66197784
 SIZE (rust/rustc-bootstrap-amd64-1.29.0-20180911.tar.xz) = 69046436
 SIZE (rust/rustc-bootstrap-i386-1.29.0-20180911.tar.xz) = 69087864
Index: pkg/PFRAG.aarch64-main
===
RCS file: /cvs/ports/lang/rust/pkg/PFRAG.aarch64-main,v
retrieving revision 1.7
diff -u -p -r1.7 PFRAG.aarch64-main
--- pkg/PFRAG.aarch64-main  16 Sep 2018 16:35:27 -  1.7
+++ pkg/PFRAG.aarch64-main  24 Sep 2018 04:56:13 -
@@ -1,136 +1,136 @@
 @comment $OpenBSD: PFRAG.aarch64-main,v 1.7 2018/09/16 16:35:27 landry Exp $
-lib/libarena-a28a5239c21324e4.so
-lib/libfmt_macros-f86ce0fcd98a92be.so
-lib/libgraphviz-2c501434989aa072.so
-lib/libproc_macro-46ea70bf16db1deb.so
-lib/librustc-1bdf5627f14b7e49.so
-lib/librustc_allocator-c36501787780346a.so
-lib/librustc_borrowck-5d90a7e1206ca46f.so
-lib/librustc_codegen_utils-4bb837a26c47493e.so
-lib/librustc_cratesio_shim-ce814461bbf62535.so
-lib/librustc_data_structures-5ccb4c472b7fc56b.so
-lib/librustc_driver-e7d55822aaa2e8de.so
-lib/librustc_errors-79648231eb119ae7.so
-lib/librustc_incremental-60d92cc692647ac6.so
-lib/librustc_lint-b94f70b26cb96ec3.so
-lib/librustc_metadata-093091a4ef8e000e.so
-lib/librustc_mir-b493e4236d59fcf8.so
-lib/librustc_passes-f0f1c3f23fd4565d.so
-lib/librustc_platform_intrinsics-9318cd7300de16d5.so
-lib/librustc_plugin-1c83cbd70c886f12.so
-lib/librustc_privacy-237019ebdb7110da.so
-lib/librustc_resolve-b03242d8c398e145.so
-lib/librustc_save_analysis-889c431835b423ae.so
-lib/librustc_target-6ca946e4afaa9e06.so
-lib/librustc_traits-1a554f92d15e93e5.so
-lib/librustc_typeck-57141e0020b23425.so
-lib/libserialize-677921a01baebfc5.so
-lib/libstd-226ef2f6a3f6b1bd.so
-lib/libsyntax-04ac80e49a3af2a9.so
-lib/libsyntax_ext-c434ec13f437fba8.so
-lib/libsyntax_pos-fa13f626bf1ea5ea.so
-lib/libterm-a987a0d12723767f.so

update: lang/rust 1.28.0

[Sebastien Marie]

Hi,

Here an update for lang/rust.

Built on amd64, i386 and aarch64.

Tested on amd64 by rebuilding reverse dependencies (ripgrep, exa,
librsvg, firefox).

Testsuite ran on amd64 and i386 (few new errors, but unimportant ones)

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.75
diff -u -p -r1.75 Makefile
--- Makefile23 Jul 2018 06:56:43 -  1.75
+++ Makefile3 Aug 2018 12:32:35 -
@@ -13,14 +13,14 @@ DPB_PROPERTIES =parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.27.2
-CARGO_V =  0.28.0
+V =1.28.0
+CARGO_V =  0.29.0
 DISTNAME = rustc-${V}-src
 
 # rustc bootstrap version
-BV-aarch64 =   1.27.0-20180622
-BV-amd64 = 1.27.0-20180619
-BV-i386 =  1.27.0-20180619
+BV-aarch64 =   1.28.0-20180803
+BV-amd64 = 1.28.0-20180731
+BV-i386 =  1.28.0-20180731
 BV =   ${BV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
@@ -149,9 +149,6 @@ do-configure:
echo 'channel = "stable"' >>${WRKBUILD}/config.toml
echo 'rpath = false' >>${WRKBUILD}/config.toml
echo 'codegen-tests = false' >>${WRKBUILD}/config.toml
-
-   # XXX workaround for https://github.com/rust-lang/rust/issues/51650
-   echo 'deny-warnings = false' >>${WRKBUILD}/config.toml
 
echo '[dist]' >>${WRKBUILD}/config.toml
echo 'src-tarball = false' >>${WRKBUILD}/config.toml
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo23 Jul 2018 06:56:43 -  1.39
+++ distinfo3 Aug 2018 12:32:35 -
@@ -1,8 +1,8 @@
-SHA256 (rust/rustc-1.27.2-src.tar.xz) = 
vwIoByrWCr2J3YHI4lrh57SzHgDnNhLn9JheMUStW9o=
-SHA256 (rust/rustc-bootstrap-aarch64-1.27.0-20180622.tar.xz) = 
KvznQPB3IGDiLyXiYn0z8660z9pzIIB+FJhH10kWuZI=
-SHA256 (rust/rustc-bootstrap-amd64-1.27.0-20180619.tar.xz) = 
xsSrF88f8sOV2olsWWqgs5zzCCrjAlVloiMZxJbG2wc=
-SHA256 (rust/rustc-bootstrap-i386-1.27.0-20180619.tar.xz) = 
lNinRfIwy5fHHk+NJbbtO8hiy0693MN7lpvd/QN/PfU=
-SIZE (rust/rustc-1.27.2-src.tar.xz) = 55461280
-SIZE (rust/rustc-bootstrap-aarch64-1.27.0-20180622.tar.xz) = 63103156
-SIZE (rust/rustc-bootstrap-amd64-1.27.0-20180619.tar.xz) = 66376352
-SIZE (rust/rustc-bootstrap-i386-1.27.0-20180619.tar.xz) = 66734544
+SHA256 (rust/rustc-1.28.0-src.tar.xz) = 
ioma/UtQK06/9c/ILLp3qMs3ETteYBjxXAlUWTYIGEg=
+SHA256 (rust/rustc-bootstrap-aarch64-1.28.0-20180803.tar.xz) = 
yCtP78txnTUi9mPFb8RVUT2SmHAJe1TVgCEpqsZkgas=
+SHA256 (rust/rustc-bootstrap-amd64-1.28.0-20180731.tar.xz) = 
3ofrh6WsZseeWQWKQ+UbdN3FY+PWOeyIiknzieWtZyI=
+SHA256 (rust/rustc-bootstrap-i386-1.28.0-20180731.tar.xz) = 
mjZ0k280AoarpYpGVwpuYQ5ok+yDmgnXSsC1q1sSCHA=
+SIZE (rust/rustc-1.28.0-src.tar.xz) = 55838968
+SIZE (rust/rustc-bootstrap-aarch64-1.28.0-20180803.tar.xz) = 65530604
+SIZE (rust/rustc-bootstrap-amd64-1.28.0-20180731.tar.xz) = 69018184
+SIZE (rust/rustc-bootstrap-i386-1.28.0-20180731.tar.xz) = 69059092
Index: patches/patch-src_bootstrap_builder_rs
===
RCS file: patches/patch-src_bootstrap_builder_rs
diff -N patches/patch-src_bootstrap_builder_rs
--- patches/patch-src_bootstrap_builder_rs  29 Jun 2018 05:19:47 -  
1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_bootstrap_builder_rs,v 1.5 2018/06/29 05:19:47 landry Exp $
-- always pass -j to cargo
-- disable test::Bootstrap (require network)
-Index: src/bootstrap/builder.rs
 src/bootstrap/builder.rs.orig
-+++ src/bootstrap/builder.rs
-@@ -312,7 +312,7 @@ impl<'a> Builder<'a> {
- native::Llvm, tool::Rustfmt, tool::Miri, native::Lld),
- Kind::Check => describe!(check::Std, check::Test, check::Rustc, 
check::CodegenBackend,
- check::Rustdoc),
--Kind::Test => describe!(test::Tidy, test::Bootstrap, test::Ui, 
test::RunPass,
-+Kind::Test => describe!(test::Tidy, test::Ui, test::RunPass,
- test::CompileFail, test::ParseFail, test::RunFail, 
test::RunPassValgrind,
- test::MirOpt, test::Codegen, test::CodegenUnits, 
test::Incremental, test::Debuginfo,
- test::UiFullDeps, test::RunPassFullDeps, 
test::RunFailFullDeps,
-@@ -559,11 +559,7 @@ impl<'a> Builder<'a> {
- cargo.env("RUST_CHECK", "1");
- }
- 
--// If we were invoked from `make` then that's already got a jobserver
--// set up for us so no need to tell Cargo about jobs all over again.
--if env::var_os("MAKEFLAGS").is_none() && 
env::var_os("MFLAGS").is_none() {
-- 

update: lang/rust 1.27.2

[Sebastien Marie]

Hi,

Here a maintenance update for lang/rust.

ChangeLog:
https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1272-2018-07-20

Version 1.27.2 (2018-07-20)
Compatibility Notes

The borrow checker was fixed to avoid potential unsoundness when 
using match ergonomics: #52213.

Built and tested (testsuite only) on amd64 and i386.
Built on aarch64.

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile11 Jul 2018 09:16:53 -  1.73
+++ Makefile21 Jul 2018 08:48:28 -
@@ -12,7 +12,7 @@ DPB_PROPERTIES =  parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.27.1
+V =1.27.2
 CARGO_V =  0.28.0
 DISTNAME = rustc-${V}-src
 
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.38
diff -u -p -r1.38 distinfo
--- distinfo11 Jul 2018 08:35:59 -  1.38
+++ distinfo21 Jul 2018 08:48:28 -
@@ -1,8 +1,8 @@
-SHA256 (rust/rustc-1.27.1-src.tar.xz) = 
lI4mRQV5YO4cA9nw6PeBM6X3PZypokvFYSbjlaIS0lw=
+SHA256 (rust/rustc-1.27.2-src.tar.xz) = 
vwIoByrWCr2J3YHI4lrh57SzHgDnNhLn9JheMUStW9o=
 SHA256 (rust/rustc-bootstrap-aarch64-1.27.0-20180622.tar.xz) = 
KvznQPB3IGDiLyXiYn0z8660z9pzIIB+FJhH10kWuZI=
 SHA256 (rust/rustc-bootstrap-amd64-1.27.0-20180619.tar.xz) = 
xsSrF88f8sOV2olsWWqgs5zzCCrjAlVloiMZxJbG2wc=
 SHA256 (rust/rustc-bootstrap-i386-1.27.0-20180619.tar.xz) = 
lNinRfIwy5fHHk+NJbbtO8hiy0693MN7lpvd/QN/PfU=
-SIZE (rust/rustc-1.27.1-src.tar.xz) = 55458892
+SIZE (rust/rustc-1.27.2-src.tar.xz) = 55461280
 SIZE (rust/rustc-bootstrap-aarch64-1.27.0-20180622.tar.xz) = 63103156
 SIZE (rust/rustc-bootstrap-amd64-1.27.0-20180619.tar.xz) = 66376352
 SIZE (rust/rustc-bootstrap-i386-1.27.0-20180619.tar.xz) = 66734544
Index: pkg/PFRAG.aarch64-main
===
RCS file: /cvs/ports/lang/rust/pkg/PFRAG.aarch64-main,v
retrieving revision 1.4
diff -u -p -r1.4 PFRAG.aarch64-main
--- pkg/PFRAG.aarch64-main  11 Jul 2018 08:35:59 -  1.4
+++ pkg/PFRAG.aarch64-main  22 Jul 2018 17:02:35 -
@@ -1,119 +1,119 @@
 @comment $OpenBSD: PFRAG.aarch64-main,v 1.4 2018/07/11 08:35:59 ajacoutot Exp $
-lib/libarena-2ca22f4465b4ffe0.so
-lib/libfmt_macros-e2804a0dbc4cc307.so
-lib/libgraphviz-884cbe192015e845.so
-lib/libproc_macro-5d7c1f7484a81362.so
-lib/librustc-c7531c14c018f796.so
-lib/librustc_allocator-b2f9ceb0ec2e3258.so
-lib/librustc_borrowck-0a8f394c27a1d41b.so
-lib/librustc_cratesio_shim-735482c265969a7e.so
-lib/librustc_data_structures-58557c6f8fe7f6ae.so
-lib/librustc_driver-745793a2f889b21a.so
-lib/librustc_errors-1f3be77330236430.so
-lib/librustc_incremental-f4c8b40c9a8cf0e7.so
-lib/librustc_lint-632b19faac3e3cfb.so
-lib/librustc_metadata-0dd56c794edbbfeb.so
-lib/librustc_mir-fcfbd3e99db383e4.so
-lib/librustc_passes-1fe35fb3ff4b1732.so
-lib/librustc_platform_intrinsics-be3ad5cdafb0d178.so
-lib/librustc_plugin-03a6f80dba599489.so
-lib/librustc_privacy-6eda6f6e0f658c02.so
-lib/librustc_resolve-49416edb2ea282b4.so
-lib/librustc_save_analysis-489b167e3c12a2ae.so
-lib/librustc_target-661a9bae0df39ef3.so
-lib/librustc_traits-887ce59c49e61f6f.so
-lib/librustc_trans_utils-77e1dfc77cdffe93.so
-lib/librustc_typeck-283879f18a655517.so
-lib/libserialize-b04b7c16605e8061.so
-lib/libstd-c43a88b5568e7da4.so
-lib/libsyntax-53eeba73418368c8.so
-lib/libsyntax_ext-99a9ec8bffb2684a.so
-lib/libsyntax_pos-4b90c22dfc8b3014.so
-lib/libterm-3080d8df9e1ed841.so
-lib/libtest-196692afd61242aa.so
+lib/libarena-abb94d77fc5c821a.so
+lib/libfmt_macros-e0c8b7ebb6c156c9.so
+lib/libgraphviz-1b1761113582da62.so
+lib/libproc_macro-fbd2178c1c09dd20.so
+lib/librustc-b71297d908597a4b.so
+lib/librustc_allocator-21fccc26b8187a63.so
+lib/librustc_borrowck-9913af467b86dd6a.so
+lib/librustc_cratesio_shim-045aeba0180baf88.so
+lib/librustc_data_structures-7d5770b6429bd541.so
+lib/librustc_driver-ff508a84d4e280f1.so
+lib/librustc_errors-dbd329737be6e3b4.so
+lib/librustc_incremental-421c4c5503f10fff.so
+lib/librustc_lint-f1facdc5eeb993b1.so
+lib/librustc_metadata-e74a6dc15eb11cc7.so
+lib/librustc_mir-222a489f82d07214.so
+lib/librustc_passes-2da059534c4e9f46.so
+lib/librustc_platform_intrinsics-941b59a472340a3f.so
+lib/librustc_plugin-c745f5233d5d7f73.so
+lib/librustc_privacy-9c579460728c2c20.so
+lib/librustc_resolve-fe076dfc4c71b5cd.so
+lib/librustc_save_analysis-b304087857239f17.so
+lib/librustc_target-dc6b946df3737268.so
+lib/librustc_traits-3d350d1b2919d273.so
+lib/librustc_trans_utils-0f53c41934525151.so
+lib/librustc_typeck-fc7b9159ceb71539.so
+lib/libserialize-64e8473dffe59e83.so
+lib/libstd-f0e4534d5edba6f4.so
+lib/libsyntax-194ca9f25e70b406.so

bugfix update: lang/rust 1.26.2

[Sebastien Marie]

Hi,

Second bugfix update for lang/rust:
https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1262-2018-06-05

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile1 Jun 2018 06:02:10 -   1.69
+++ Makefile4 Jun 2018 09:30:45 -
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile,v 1.69 2018/06/01 06:02:10 landry Exp $
 
-# snapshots are only available for amd64 and i386, for now
+# snapshots are only available these archs
 ONLY_FOR_ARCHS =   aarch64 amd64 i386
 
 .if "${MACHINE_ARCH}" == "i386"
@@ -12,7 +12,7 @@ DPB_PROPERTIES =  parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.26.1
+V =1.26.2
 CARGO_V =  0.27.0
 DISTNAME = rustc-${V}-src
 
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo1 Jun 2018 06:02:10 -   1.36
+++ distinfo4 Jun 2018 09:30:45 -
@@ -1,8 +1,8 @@
-SHA256 (rust/rustc-1.26.1-src.tar.xz) = 
XtIeTC+5LCTPJw5qA4KwAZflsgWdOZ6VKNSLkkVTq2k=
+SHA256 (rust/rustc-1.26.2-src.tar.xz) = 
oSAoAL1WIfXKwCcXeQTaC5ZOtDuTYG0+THs0Kp90c7Q=
 SHA256 (rust/rustc-bootstrap-aarch64-1.26.0-20180518.tar.xz) = 
zakj9bWFnY6WTfUaov5nz4y3k/6nW5W/mY7Mpd1cNRc=
 SHA256 (rust/rustc-bootstrap-amd64-1.26.0-20180508.tar.xz) = 
zLG8iaYTVbN/7chCkUC+pCuNl6u0YVNd5XEchVOMKYQ=
 SHA256 (rust/rustc-bootstrap-i386-1.26.0-20180509.tar.xz) = 
AFGnEZ5KRPiJFPWPrx8JIb84PHXqISOUQHe959ErYzc=
-SIZE (rust/rustc-1.26.1-src.tar.xz) = 54604108
+SIZE (rust/rustc-1.26.2-src.tar.xz) = 54613640
 SIZE (rust/rustc-bootstrap-aarch64-1.26.0-20180518.tar.xz) = 61904032
 SIZE (rust/rustc-bootstrap-amd64-1.26.0-20180508.tar.xz) = 6671
 SIZE (rust/rustc-bootstrap-i386-1.26.0-20180509.tar.xz) = 67845872
Index: pkg/PFRAG.aarch64-main
===
RCS file: /cvs/ports/lang/rust/pkg/PFRAG.aarch64-main,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.aarch64-main
--- pkg/PFRAG.aarch64-main  1 Jun 2018 06:02:10 -   1.2
+++ pkg/PFRAG.aarch64-main  4 Jun 2018 09:30:45 -
@@ -1,117 +1,117 @@
 @comment $OpenBSD: PFRAG.aarch64-main,v 1.2 2018/06/01 06:02:10 landry Exp $
-lib/libarena-a05d32ee855a0f48.so
-lib/libfmt_macros-845ea9e348fd239e.so
-lib/libgraphviz-6add5380c35bd69f.so
-lib/libproc_macro-edb2bb543516e8dd.so
-lib/librustc-1468eae8f8156ca1.so
-lib/librustc_allocator-6fead7c0ee66b6ec.so
-lib/librustc_back-e754f35d5246908c.so
-lib/librustc_borrowck-fdbf60aa39cb343e.so
-lib/librustc_const_math-ec40b79e0938056c.so
-lib/librustc_cratesio_shim-298443c0050df0b5.so
-lib/librustc_data_structures-f41f54d543ca0c6c.so
-lib/librustc_driver-1e2d8fea70295af8.so
-lib/librustc_errors-27526f31cf70db34.so
-lib/librustc_incremental-df58371ff4b398c2.so
-lib/librustc_lint-1a6334774d9218c9.so
-lib/librustc_metadata-845a78129669dacd.so
-lib/librustc_mir-55878739bb08f0cb.so
-lib/librustc_passes-ebd1b64d312d54c8.so
-lib/librustc_platform_intrinsics-3239fa70c7515a0e.so
-lib/librustc_plugin-3fb93b9057e93b1c.so
-lib/librustc_privacy-c72cdb22e5a935bb.so
-lib/librustc_resolve-b969dbe22b5f07e2.so
-lib/librustc_save_analysis-a4ef8babb83c12df.so
-lib/librustc_traits-263ae7756e01b7a0.so
-lib/librustc_trans_utils-bd2dada968da129a.so
-lib/librustc_typeck-cf9148d140a73356.so
-lib/libserialize-530f1e558062578e.so
-lib/libstd-0b30fd8530287a87.so
-lib/libsyntax-32fc1fbbddff27e7.so
-lib/libsyntax_ext-9f89425456ee79cf.so
-lib/libsyntax_pos-c960f651ca9da17e.so
-lib/libterm-b56c3d40677efb8f.so
-lib/libtest-cbcf18684e884afc.so
+lib/libarena-c3ccf29aa07197bc.so
+lib/libfmt_macros-d66e74b9e56f810e.so
+lib/libgraphviz-b29a5a34ecd7b122.so
+lib/libproc_macro-07dabf758608655a.so
+lib/librustc-f3117160ee100cae.so
+lib/librustc_allocator-d8bc91191cc09d70.so
+lib/librustc_back-faf4c6c46537dae4.so
+lib/librustc_borrowck-8ff1c6ab1b96ab15.so
+lib/librustc_const_math-c3dd06a52ffe27fd.so
+lib/librustc_cratesio_shim-9bdfed84cb839ace.so
+lib/librustc_data_structures-04815abdd54aecd2.so
+lib/librustc_driver-34ee207fceee92d6.so
+lib/librustc_errors-516074552369a1b0.so
+lib/librustc_incremental-0c8e41927195e475.so
+lib/librustc_lint-47147187fb74a6c2.so
+lib/librustc_metadata-a0667633dd8e784e.so
+lib/librustc_mir-f7e2846841f2458a.so
+lib/librustc_passes-9816c4d425e0aac4.so
+lib/librustc_platform_intrinsics-0ed6984b6b45c2fd.so
+lib/librustc_plugin-73ec41beedd88b88.so
+lib/librustc_privacy-00f66df7b0207daf.so
+lib/librustc_resolve-cb034d04f3e43571.so
+lib/librustc_save_analysis-c77dd8f1646c39a2.so
+lib/librustc_traits-f17e9e7b09c08e2d.so
+lib/librustc_trans_utils-3ba8b5ebd68a0186.so
+lib/librustc_typeck-ced454652990ce65.so
+lib/libserialize-5be0bb10e42b0aa2.so

Re: update: lang/rust

[Sebastien Marie]

On Fri, Mar 30, 2018 at 10:40:16AM +0200, Sebastien Marie wrote:
> Hi,
> 
> Here an update for lang/rust 1.25.0
> 
> Some changes port wise:
> - in order to keep RUST_BACKTRACE=1 during build, properly separate
>   MAKE_ENV and TEST_ENV, by introduce a TEST_BIN variable used for
>   launching rustbuild with TEST_ENV (some tests are failing if the
>   backtrace is here).
> 
> - remove llvm-6 backported patches. this version of rustc has full
>   support of it (but hashes in library names will change. PLIST patches
>   will be required when devel/llvm will be upgraded to llvm-6).
> 
> - backport #49140 to be able to run "make test" without installing rustc
>   first (and eventually regenerating PLIST).
> 
> The port has been tested:
> - build on i386 (after several tries)
> - build and pass testsuite on amd64
> - textproc/ripgrep build
> - www/mozilla-firefox build
> 

Diff regenerated with HEAD version of cvs... sorry the previous diff
didn't apply cleanly. It was spotted by landry@.

Thanks.
-- 
Sebastien Marie

Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile16 Mar 2018 07:36:40 -  1.64
+++ Makefile30 Mar 2018 09:28:44 -
@@ -13,14 +13,13 @@ DPB_PROPERTIES =parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.24.0
-CARGO_V =  0.25.0
+V =1.25.0
+CARGO_V =  0.26.0
 DISTNAME = rustc-${V}-src
-REVISION = 0
 
 # rustc bootstrap version
-BV-amd64 = 1.24.0-20180308
-BV-i386 =  1.24.0-20180316
+BV-amd64 = 1.25.0-20180326
+BV-i386 =  1.25.0-20180330
 BV =   ${BV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
@@ -86,6 +85,7 @@ LIB_DEPENDS +=devel/libgit2/libgit2 \
 
 MAKE_ENV = LIBGIT2_SYS_USE_PKG_CONFIG=1 \
RUST_BACKTRACE=1
+TEST_ENV = RUST_BACKTRACE=0
 
 # build/configuration variables
 PATCHORIG =.openbsd.orig
@@ -95,8 +95,7 @@ USE_GMAKE =   Yes
 # need for libbacktrace
 USE_LIBTOOL =  gnu
 
-TEST_DEPENDS +=${FULLPKGNAME-main}:${BUILD_PKGPATH} \
-   devel/git \
+TEST_DEPENDS +=devel/git \
sysutils/ggrep
 
 # - disable vendor checksum checks
@@ -155,6 +154,8 @@ do-configure:
 
 BUILD_BIN = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
${MODPY_BIN} ${WRKSRC}/x.py
+TEST_BIN = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
+   ${MODPY_BIN} ${WRKSRC}/x.py
 
 do-build:
${BUILD_BIN} dist --jobs=${MAKE_JOBS}
@@ -195,7 +196,7 @@ post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/lib/rustlib/etc
 
 do-test:
-   ${BUILD_BIN} test --jobs=${MAKE_JOBS}
+   ${TEST_BIN} test --jobs=${MAKE_JOBS}
 
 # bootstrap target permits to regenerate the bootstrap archive
 BOOTSTRAPDIR=${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${V}-new
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo16 Mar 2018 07:36:40 -  1.33
+++ distinfo30 Mar 2018 09:28:44 -
@@ -1,6 +1,6 @@
-SHA256 (rust/rustc-1.24.0-src.tar.gz) = 
u4J29gROh35Efyn1ZuS7+CD6Uf6i+RLVm3MjP/2VY58=
-SHA256 (rust/rustc-bootstrap-amd64-1.24.0-20180308.tar.gz) = 
qC6MXaM7/DQVJ7Z0xDkY8EphBjdMgyiQPdFfQecy7J4=
-SHA256 (rust/rustc-bootstrap-i386-1.24.0-20180316.tar.gz) = 
/XnRx0StUBhZWyUmT0a0p4maaiHZm10pcPS8t78371Q=
-SIZE (rust/rustc-1.24.0-src.tar.gz) = 67506894
-SIZE (rust/rustc-bootstrap-amd64-1.24.0-20180308.tar.gz) = 85090848
-SIZE (rust/rustc-bootstrap-i386-1.24.0-20180316.tar.gz) = 86182466
+SHA256 (rust/rustc-1.25.0-src.tar.gz) = 
7vY6Cu6lFHkwo2au54y94ki7blxoaIAb3zSEkVKWXS0=
+SHA256 (rust/rustc-bootstrap-amd64-1.25.0-20180326.tar.gz) = 
qsGPAoRUipfs1tvrVgEVaW59D6yVVyklFNnAxpD/MsE=
+SHA256 (rust/rustc-bootstrap-i386-1.25.0-20180330.tar.gz) = 
T2qMqBwoHHN1oFec63sHz8xxHBG1yOSRW+oBDmWihtI=
+SIZE (rust/rustc-1.25.0-src.tar.gz) = 98639156
+SIZE (rust/rustc-bootstrap-amd64-1.25.0-20180326.tar.gz) = 75589383
+SIZE (rust/rustc-bootstrap-i386-1.25.0-20180330.tar.gz) = 77074679
Index: patches/patch-src_bootstrap_bin_rustc_rs
===
RCS file: /cvs/ports/lang/rust/patches/patch-src_bootstrap_bin_rustc_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_bootstrap_bin_rustc_rs
--- patches/patch-src_bootstrap_bin_rustc_rs23 Feb 2018 16:38:16 -  
1.2
+++ patches/patch-src_bootstrap_bin_rustc_rs30 Mar 2018 09:28:44 -
@@ -6,7 +6,7 @@ try to reduce memory usage on i386:
 Index: src/bootstrap/bin/rustc.rs
 --- src/bootstrap/bin/rustc.rs.orig
 +++ src/bootstrap/bin/rustc.rs

update: lang/rust

[Sebastien Marie]

Hi,

Here an update for lang/rust 1.25.0

Some changes port wise:
- in order to keep RUST_BACKTRACE=1 during build, properly separate
  MAKE_ENV and TEST_ENV, by introduce a TEST_BIN variable used for
  launching rustbuild with TEST_ENV (some tests are failing if the
  backtrace is here).

- remove llvm-6 backported patches. this version of rustc has full
  support of it (but hashes in library names will change. PLIST patches
  will be required when devel/llvm will be upgraded to llvm-6).

- backport #49140 to be able to run "make test" without installing rustc
  first (and eventually regenerating PLIST).

The port has been tested:
- build on i386 (after several tries)
- build and pass testsuite on amd64
- textproc/ripgrep build
- www/mozilla-firefox build

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile13 Mar 2018 08:08:03 -  1.63
+++ Makefile30 Mar 2018 06:51:35 -
@@ -13,14 +13,13 @@ DPB_PROPERTIES =parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.24.0
-CARGO_V =  0.25.0
+V =1.25.0
+CARGO_V =  0.26.0
 DISTNAME = rustc-${V}-src
-REVISION = 0
 
 # rustc bootstrap version
-BV-amd64 = 1.24.0-20180308
-BV-i386 =  1.24.0-20180213
+BV-amd64 = 1.25.0-20180326
+BV-i386 =  1.25.0-20180330
 BV =   ${BV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
@@ -86,6 +85,7 @@ LIB_DEPENDS +=devel/libgit2/libgit2 \
 
 MAKE_ENV = LIBGIT2_SYS_USE_PKG_CONFIG=1 \
RUST_BACKTRACE=1
+TEST_ENV = RUST_BACKTRACE=0
 
 # build/configuration variables
 PATCHORIG =.openbsd.orig
@@ -95,8 +95,7 @@ USE_GMAKE =   Yes
 # need for libbacktrace
 USE_LIBTOOL =  gnu
 
-TEST_DEPENDS +=${FULLPKGNAME-main}:${BUILD_PKGPATH} \
-   devel/git \
+TEST_DEPENDS +=devel/git \
sysutils/ggrep
 
 # - disable vendor checksum checks
@@ -155,6 +154,8 @@ do-configure:
 
 BUILD_BIN = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
${MODPY_BIN} ${WRKSRC}/x.py
+TEST_BIN = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
+   ${MODPY_BIN} ${WRKSRC}/x.py
 
 do-build:
${BUILD_BIN} dist --jobs=${MAKE_JOBS}
@@ -195,7 +196,7 @@ post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/lib/rustlib/etc
 
 do-test:
-   ${BUILD_BIN} test --jobs=${MAKE_JOBS}
+   ${TEST_BIN} test --jobs=${MAKE_JOBS}
 
 # bootstrap target permits to regenerate the bootstrap archive
 BOOTSTRAPDIR=${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${V}-new
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo13 Mar 2018 08:08:03 -  1.32
+++ distinfo30 Mar 2018 06:51:35 -
@@ -1,6 +1,6 @@
-SHA256 (rust/rustc-1.24.0-src.tar.gz) = 
u4J29gROh35Efyn1ZuS7+CD6Uf6i+RLVm3MjP/2VY58=
-SHA256 (rust/rustc-bootstrap-amd64-1.24.0-20180308.tar.gz) = 
qC6MXaM7/DQVJ7Z0xDkY8EphBjdMgyiQPdFfQecy7J4=
-SHA256 (rust/rustc-bootstrap-i386-1.24.0-20180213.tar.gz) = 
nQRwYdT3n9jjmoUt8IdqrJXvhKwq6PMMCAe+49JeivQ=
-SIZE (rust/rustc-1.24.0-src.tar.gz) = 67506894
-SIZE (rust/rustc-bootstrap-amd64-1.24.0-20180308.tar.gz) = 85090848
-SIZE (rust/rustc-bootstrap-i386-1.24.0-20180213.tar.gz) = 86217512
+SHA256 (rust/rustc-1.25.0-src.tar.gz) = 
7vY6Cu6lFHkwo2au54y94ki7blxoaIAb3zSEkVKWXS0=
+SHA256 (rust/rustc-bootstrap-amd64-1.25.0-20180326.tar.gz) = 
qsGPAoRUipfs1tvrVgEVaW59D6yVVyklFNnAxpD/MsE=
+SHA256 (rust/rustc-bootstrap-i386-1.25.0-20180330.tar.gz) = 
T2qMqBwoHHN1oFec63sHz8xxHBG1yOSRW+oBDmWihtI=
+SIZE (rust/rustc-1.25.0-src.tar.gz) = 98639156
+SIZE (rust/rustc-bootstrap-amd64-1.25.0-20180326.tar.gz) = 75589383
+SIZE (rust/rustc-bootstrap-i386-1.25.0-20180330.tar.gz) = 77074679
Index: patches/patch-src_bootstrap_bin_rustc_rs
===
RCS file: /cvs/ports/lang/rust/patches/patch-src_bootstrap_bin_rustc_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_bootstrap_bin_rustc_rs
--- patches/patch-src_bootstrap_bin_rustc_rs23 Feb 2018 16:38:16 -  
1.2
+++ patches/patch-src_bootstrap_bin_rustc_rs30 Mar 2018 06:51:35 -
@@ -6,7 +6,7 @@ try to reduce memory usage on i386:
 Index: src/bootstrap/bin/rustc.rs
 --- src/bootstrap/bin/rustc.rs.orig
 +++ src/bootstrap/bin/rustc.rs
-@@ -179,6 +179,12 @@ fn main() {
+@@ -174,6 +174,12 @@ fn main() {
  cmd.arg("-Ccodegen-units=16").arg("-Zthinlto");
  }
  
Index: patches/patch-src_bootstrap_builder_rs

Re: update: lang/rust 1.24

[Landry Breuil]

On Mon, Feb 19, 2018 at 07:45:48AM +0100, Landry Breuil wrote:
> On Sat, Feb 17, 2018 at 01:24:27PM +0100, Sebastien Marie wrote:
> > Hi,
> > 
> > The following diff update lang/rust to 1.24.
> > 
> > Tests that was done:
> > - build on i386 - but it seems the memory usage still grow. I added a
> >   new knob to try to reduce it. I was able to build but after several
> >   tries. BROKEN-i386 might be necessary ?
> > 
> > - build on amd64
> > - pass rustc testsuite on amd64
> 
> Here make test fails early with:
> 
> tidy error: 
> /usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src/rustllvm/ArchiveWrapper.cpp:245:
>  tab character
> tidy error: 
> /usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src/rustllvm/ArchiveWrapper.cpp:245:
>  trailing whitespace
> some tidy checks failed
> 
> 
> command did not execute successfully: 
> "/usr/obj/ports/rust-1.24.0/build-amd64/build/x86_64-unknown-openbsd/stage0-tools-bin/tidy"
>  "/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src"
> expected success, got: exit code: 1
> 
> 
> Traceback (most recent call last):
>   File "/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/x.py", line 20, in 
> 
> bootstrap.main()
>   File 
> "/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src/bootstrap/bootstrap.py", 
> line 758, in main
> bootstrap()
>   File 
> "/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src/bootstrap/bootstrap.py", 
> line 749, in bootstrap
> run(args, env=env, verbose=build.verbose)
>   File 
> "/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src/bootstrap/bootstrap.py", 
> line 148, in run
> raise RuntimeError(err)
> RuntimeError: failed to run: 
> /usr/obj/ports/rust-1.24.0/build-amd64/build/bootstrap/debug/bootstrap test 
> --jobs=1
> 
> 
> Other than that, it builds/packages on amd64, and fails on miniz-sys on i386 
> at
> the first try. Will give it another chance locally..

Tried on i386 4 or 5 times, always failed sadly.

rustc command:
"/build/obj/ports/rust-1.24.0/rustc-bootstrap-i386-1.24.0-20180213/bin/rustc"
"--crate-name" "rustc" "librustc/lib.rs" "--crate-type" "dylib"
"--emit=dep-info,link" "-C" "prefer-dynamic" "-C" "opt-level=2"  
"--cfg" "stage1" "--sysroot"
"/build/obj/ports/rust-1.24.0/build-i386/build/i686-unknown-openbsd/stage0-sysroot"
"-Cprefer-dynamic" "-C" "debug-assertions=n" "-C" "codegen-units=16"
"-C" "opt-level=1" "-Z" "fewer-names" "-Z" "force-unstable-if-unmarked"
"--color=always"
terminating with uncaught exception of type std::bad_alloc: std::bad_alloc
...
(signal: 6, SIGABRT: process abort signal)
thread 'main' panicked at 'command did not execute successfully:
"/build/obj/ports/rust-1.24.0/rustc-bootstrap-i386-1.24.0-20180213/bin/car
go" "build" "--target" "i686-unknown-openbsd" "-j" "1" "-v" "--release"
"--frozen" "--features" " jemalloc llvm" "--manifest-path" "/build/
obj/ports/rust-1.24.0/rustc-1.24.0-src/src/rustc/Cargo.toml"
"--message-format" "json"
expected success, got: exit code: 101', bootstrap/compile.rs:886:9   

My ulimit is 3g/max.

Landry

Re: update: lang/rust 1.24

[Laurence Tratt]

On Sun, Feb 18, 2018 at 06:03:47PM +0100, Sebastien Marie wrote:

Hello Sebastien,

> It seems that the uploaded file is truncated in some way.
> 
> $ tar zft rustc-bootstrap-amd64-1.24.0-20180213.tar.gz >/dev/null
> gzip: stdin: Input/output error
> tar: End of archive volume 1 reached
> 
> distinfo has the right checksum.
> 
> I am re-uploading the file (at 30K/s, so please wait a bit). I removed
> the bad file, and the new one will be available once completely
> uploaded.

Thanks! With your update, it builds and installs correctly; and runs all the
programs I've tried it upon. "make test" does fail with the same error that
Landry noticed, although I must admit that it doesn't look very OpenBSD
specific.


Laurie
-- 
Personal http://tratt.net/laurie/
Software Development Teamhttp://soft-dev.org/
   https://github.com/ltratt  http://twitter.com/laurencetratt

Re: update: lang/rust 1.24

[Landry Breuil]

On Sat, Feb 17, 2018 at 01:24:27PM +0100, Sebastien Marie wrote:
> Hi,
> 
> The following diff update lang/rust to 1.24.
> 
> Tests that was done:
> - build on i386 - but it seems the memory usage still grow. I added a
>   new knob to try to reduce it. I was able to build but after several
>   tries. BROKEN-i386 might be necessary ?
> 
> - build on amd64
> - pass rustc testsuite on amd64

Here make test fails early with:

tidy error: 
/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src/rustllvm/ArchiveWrapper.cpp:245:
 tab character
tidy error: 
/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src/rustllvm/ArchiveWrapper.cpp:245:
 trailing whitespace
some tidy checks failed


command did not execute successfully: 
"/usr/obj/ports/rust-1.24.0/build-amd64/build/x86_64-unknown-openbsd/stage0-tools-bin/tidy"
 "/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src"
expected success, got: exit code: 1


Traceback (most recent call last):
  File "/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/x.py", line 20, in 
bootstrap.main()
  File 
"/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src/bootstrap/bootstrap.py", line 
758, in main
bootstrap()
  File 
"/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src/bootstrap/bootstrap.py", line 
749, in bootstrap
run(args, env=env, verbose=build.verbose)
  File 
"/usr/obj/ports/rust-1.24.0/rustc-1.24.0-src/src/bootstrap/bootstrap.py", line 
148, in run
raise RuntimeError(err)
RuntimeError: failed to run: 
/usr/obj/ports/rust-1.24.0/build-amd64/build/bootstrap/debug/bootstrap test 
--jobs=1


Other than that, it builds/packages on amd64, and fails on miniz-sys on i386 at
the first try. Will give it another chance locally..

Landry

Re: update: lang/rust 1.24

[Sebastien Marie]

On Sun, Feb 18, 2018 at 10:11:44AM +, Laurence Tratt wrote:
> On Sat, Feb 17, 2018 at 01:24:27PM +0100, Sebastien Marie wrote:
> 
> Hello Sebastien,
> 
> > The following diff update lang/rust to 1.24.
> 
> Thanks for this! I had a couple of problems. First the distinfo seems to be
> out of date? I got this error from fetch:
> 
>   >> Size does not match for rust/rustc-bootstrap-amd64-1.24.0-20180213.tar.gz
> 
> After I regenerated distinfo myself the build then died pretty quickly:
> 

It seems that the uploaded file is truncated in some way.

$ tar zft rustc-bootstrap-amd64-1.24.0-20180213.tar.gz >/dev/null
gzip: stdin: Input/output error
tar: End of archive volume 1 reached

distinfo has the right checksum.

I am re-uploading the file (at 30K/s, so please wait a bit). I removed
the bad file, and the new one will be available once completely
uploaded.

Thanks for your report, and the sorry for the inconvenience.
-- 
Sebastien Marie

Re: update: lang/rust 1.24

[Laurence Tratt]

On Sat, Feb 17, 2018 at 01:24:27PM +0100, Sebastien Marie wrote:

Hello Sebastien,

> The following diff update lang/rust to 1.24.

Thanks for this! I had a couple of problems. First the distinfo seems to be
out of date? I got this error from fetch:

  >> Size does not match for rust/rustc-bootstrap-amd64-1.24.0-20180213.tar.gz

After I regenerated distinfo myself the build then died pretty quickly:

  ===>  Building for rust-1.24.0
  cd /home/ports/pobj/rust-1.24.0/build-amd64 && exec /usr/bin/env -i 
LIBGIT2_SYS_USE_PKG_CONFIG=1  RUST_BACKTRACE=1 CC=cc 
PYTHONUSERBASE=/home/ports/pobj/rust-1.24.0 
CONFIG_SITE='/home/ports/pobj/rust-1.24.0/config.site' 
LIBTOOL="/usr/local/bin/libtool"  
PATH='/home/ports/pobj/rust-1.24.0/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin'
 PREFIX='/usr/local'  LOCALBASE='/usr/local' X11BASE='/usr/X11R6'  CFLAGS='-O2 
-pipe'  TRUEPREFIX='/usr/local' DESTDIR=''  HOME='/rust-1.24.0_writes_to_HOME' 
COMPILER_VERSION=clang  PICFLAG="-fpic"  BINGRP=bin BINOWN=root BINMODE=755 
NONBINMODE=644  DIRMODE=755  INSTALL_COPY=-c INSTALL_STRIP=-s  MANGRP=bin 
MANOWN=root MANMODE=644 
BSD_INSTALL_PROGRAM="/home/ports/pobj/rust-1.24.0/bin/install -c -s  -m 755"  
BSD_INSTALL_SCRIPT="/home/ports/pobj/rust-1.24.0/bin/install -c  -m 755"  
BSD_INSTALL_DATA="/home/ports/pobj/rust-1.24.0/bin/install -c  -m 644"  
BSD_INSTALL_MAN="/home/ports/pobj/rust-1.24.0/bin/install -c  -m 644"  
BSD_INSTALL_PROGRAM_DIR="/home/ports/pobj/rust-1.24.0/bin/install -d  -m 755"  
BSD_INSTALL_SCRIPT_DIR="/home/ports/pobj/rust-1.24.0/bin/install -d  -m 755"  
BSD_INSTALL_DATA_DIR="/home/ports/pobj/rust-1.24.0/bin/install -d  -m 755"  
BSD_INSTALL_MAN_DIR="/home/ports/pobj/rust-1.24.0/bin/install -d  -m 755"  
/usr/local/bin/python2.7 /home/ports/pobj/rust-1.24.0/rustc-1.24.0-src/x.py 
dist --jobs=1
  running: 
/home/ports/pobj/rust-1.24.0/rustc-bootstrap-amd64-1.24.0-20180213/bin/cargo 
build --manifest-path 
/home/ports/pobj/rust-1.24.0/rustc-1.24.0-src/src/bootstrap/Cargo.toml 
--verbose --verbose --frozen
  error: process didn't exit successfully: 
`/home/ports/pobj/rust-1.24.0/rustc-bootstrap-amd64-1.24.0-20180213/bin/rustc 
-vV` (signal: 9, SIGKILL: kill)
  --- stderr
  ld.so: rustc.bin: can't load library 'libstd-660d119e70d3682d.so'

Since this may be related to the distinfo problem, I haven't investigated
further yet.


Laurie
-- 
Personal http://tratt.net/laurie/
Software Development Teamhttp://soft-dev.org/
   https://github.com/ltratt  http://twitter.com/laurencetratt

update: lang/rust 1.24

[Sebastien Marie]

Hi,

The following diff update lang/rust to 1.24.

Tests that was done:
- build on i386 - but it seems the memory usage still grow. I added a
  new knob to try to reduce it. I was able to build but after several
  tries. BROKEN-i386 might be necessary ?

- build on amd64
- pass rustc testsuite on amd64
- build www/mozilla-firefox on amd64
- build and test textproc/ripgrep on amd64

The diff integrates some backported patches for be buildable with llvm-6
too (plist will just need an update as hash on filenames change).

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile29 Jan 2018 18:45:39 -  1.59
+++ Makefile17 Feb 2018 12:13:30 -
@@ -12,13 +12,13 @@ DPB_PROPERTIES =parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.23.0
-CARGO_V =  0.24.0
+V =1.24.0
+CARGO_V =  0.25.0
 DISTNAME = rustc-${V}-src
 
 # rustc bootstrap version
-BV-amd64 = 1.23.0-20180124
-BV-i386 =  1.23.0-20180125
+BV-amd64 = 1.24.0-20180213
+BV-i386 =  1.24.0-20180213
 BV =   ${BV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
@@ -87,7 +87,8 @@ USE_GMAKE =   Yes
 USE_LIBTOOL =  gnu
 
 TEST_DEPENDS +=${FULLPKGNAME-main}:${BUILD_PKGPATH} \
-   devel/git
+   devel/git \
+   sysutils/ggrep
 
 # - disable vendor checksum checks
 # - SUBSTR cargo testsuite
@@ -137,7 +138,6 @@ do-configure:
echo 'llvm-config = "${LOCALBASE}/bin/llvm-config"' \
>>${WRKBUILD}/config.toml
 .endif
-
 
 BUILD_BIN = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
${MODPY_BIN} ${WRKSRC}/x.py
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo27 Jan 2018 09:22:00 -  1.30
+++ distinfo17 Feb 2018 12:13:30 -
@@ -1,6 +1,6 @@
-SHA256 (rust/rustc-1.23.0-src.tar.gz) = 
dGSVOHHc/fqK/MU2kWpobdFWqDM52OxNXLTrL+FGy5E=
-SHA256 (rust/rustc-bootstrap-amd64-1.23.0-20180124.tar.gz) = 
C15P+JfoE6nuMD0u6WMxd5ipli+Tybr1u5u/WQrq/Sc=
-SHA256 (rust/rustc-bootstrap-i386-1.23.0-20180125.tar.gz) = 
dZuoJj8CW6+bXkmhgHLvzsP00k9fro1JZQaN1yaC1f4=
-SIZE (rust/rustc-1.23.0-src.tar.gz) = 60010149
-SIZE (rust/rustc-bootstrap-amd64-1.23.0-20180124.tar.gz) = 74050566
-SIZE (rust/rustc-bootstrap-i386-1.23.0-20180125.tar.gz) = 75732565
+SHA256 (rust/rustc-1.24.0-src.tar.gz) = 
u4J29gROh35Efyn1ZuS7+CD6Uf6i+RLVm3MjP/2VY58=
+SHA256 (rust/rustc-bootstrap-amd64-1.24.0-20180213.tar.gz) = 
HF/ZvsS/EMaGM4GaiZa2/worbtYxwpwreU2p8Bhw3fE=
+SHA256 (rust/rustc-bootstrap-i386-1.24.0-20180213.tar.gz) = 
nQRwYdT3n9jjmoUt8IdqrJXvhKwq6PMMCAe+49JeivQ=
+SIZE (rust/rustc-1.24.0-src.tar.gz) = 67506894
+SIZE (rust/rustc-bootstrap-amd64-1.24.0-20180213.tar.gz) = 85135015
+SIZE (rust/rustc-bootstrap-i386-1.24.0-20180213.tar.gz) = 86217512
Index: patches/patch-src_bootstrap_bin_rustc_rs
===
RCS file: /cvs/ports/lang/rust/patches/patch-src_bootstrap_bin_rustc_rs,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_bootstrap_bin_rustc_rs
--- patches/patch-src_bootstrap_bin_rustc_rs27 Jan 2018 09:22:00 -  
1.1
+++ patches/patch-src_bootstrap_bin_rustc_rs17 Feb 2018 12:13:30 -
@@ -2,16 +2,18 @@ $OpenBSD: patch-src_bootstrap_bin_rustc_
 try to reduce memory usage on i386:
  - small code size to optimize (more codegen-units)
  - optimization level to 1 (instead of 2) to reduce the work in memory
+ - reduce memory use by retaining fewer names within compilation artifacts
 Index: src/bootstrap/bin/rustc.rs
 --- src/bootstrap/bin/rustc.rs.orig
 +++ src/bootstrap/bin/rustc.rs
-@@ -183,6 +183,11 @@ fn main() {
- cmd.arg("-C").arg(format!("codegen-units={}", s));
+@@ -179,6 +179,12 @@ fn main() {
+ cmd.arg("-Ccodegen-units=16").arg("-Zthinlto");
  }
  
 +if target.contains("i686-unknown-openbsd") && crate_name == "rustc" {
 +cmd.arg("-C").arg("codegen-units=16")
-+   .arg("-C").arg("opt-level=1");
++   .arg("-C").arg("opt-level=1")
++   .arg("-Z").arg("fewer-names");
 +}
 +
  // Emit save-analysis info.
Index: patches/patch-src_bootstrap_builder_rs
===
RCS file: /cvs/ports/lang/rust/patches/patch-src_bootstrap_builder_rs,v
re

Re: [update] lang/rust 1.23

[Landry Breuil]

On Fri, Jan 26, 2018 at 06:10:43AM +0100, Landry Breuil wrote:
> On Thu, Jan 25, 2018 at 05:27:16PM +0100, Sebastien Marie wrote:
> > Hi,
> > 
> > The following diff updates lang/rust to 1.23 (released since approx 3
> > weeks).
> > 
> > I was still able to build it on i386 (but with effort), so I keep it
> > BROKEN-i386.
> > 
> > The diff was tested on amd64:
> >   - lang/rust build+testsuite
> >   - textproc/ripgrep build+testsuite
> >   - www/mozilla-firefox build
> > 
> > I only built it on i386.
> 
> Thanks for working on this. Rust itself builds on amd64 (with ulimit -d
> 4G, 3G wasnt enough) and i386 (with ulimit -d to the max)
> 
> < Extended { stage: 2, host: "x86_64-unknown-openbsd", target: 
> "x86_64-unknown-openbsd" }
> Build completed successfully in 2:22:46
> < Extended { stage: 2, host: "i686-unknown-openbsd", target: 
> "i686-unknown-openbsd" }
> Build completed successfully in 5:47:02
> 
> firefox 59.0beta3 built fine on amd64 with that version. Will try i386
> next.

firefox 59.0beta4 built fine with this new rust on i386, once i added
--disable-debug-symbols to CONFIGURE_ARGS.

Landry

[update] lang/rust 1.23

[Sebastien Marie]

Hi,

The following diff updates lang/rust to 1.23 (released since approx 3
weeks).

I was still able to build it on i386 (but with effort), so I keep it
BROKEN-i386.

The diff was tested on amd64:
  - lang/rust build+testsuite
  - textproc/ripgrep build+testsuite
  - www/mozilla-firefox build

I only built it on i386.

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile10 Dec 2017 13:27:03 -  1.56
+++ Makefile25 Jan 2018 13:52:18 -
@@ -9,13 +9,13 @@ DPB_PROPERTIES =  parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.22.1
-CARGO_V =  0.23.0
+V =1.23.0
+CARGO_V =  0.24.0
 DISTNAME = rustc-${V}-src
 
 # rustc bootstrap version
-BV-amd64 = 1.22.0-20171121
-BV-i386 =  1.22.1-20171125
+BV-amd64 = 1.23.0-20180124
+BV-i386 =  1.23.0-20180125
 BV =   ${BV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
@@ -66,17 +66,14 @@ MODPY_RUNDEP =  No
 BUILD_DEPENDS +=   devel/cmake
 BUILD_DEPENDS +=   shells/bash
 BUILD_DEPENDS +=   devel/llvm
-
-.if ! ${BUILD_DEPENDS:Mdevel/llvm}
-# use ninja to compile embedded llvm
 BUILD_DEPENDS +=   devel/ninja
-.endif
 
 LIB_DEPENDS += devel/libgit2/libgit2 \
net/curl \
security/libssh2
 
-MAKE_ENV = LIBGIT2_SYS_USE_PKG_CONFIG=1
+MAKE_ENV = LIBGIT2_SYS_USE_PKG_CONFIG=1 \
+   RUST_BACKTRACE=1
 
 # build/configuration variables
 PATCHORIG =.openbsd.orig
@@ -124,9 +121,6 @@ do-configure:
echo 'channel = "stable"' >>${WRKBUILD}/config.toml
echo 'rpath = false' >>${WRKBUILD}/config.toml
echo 'codegen-tests = false' >>${WRKBUILD}/config.toml
-.if "${MACHINE_ARCH}" == "i386"
-   echo 'codegen-units = 16' >>${WRKBUILD}/config.toml
-.endif
 
echo '[dist]' >>${WRKBUILD}/config.toml
echo 'src-tarball = false' >>${WRKBUILD}/config.toml
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo4 Dec 2017 17:31:49 -   1.29
+++ distinfo25 Jan 2018 13:52:18 -
@@ -1,6 +1,6 @@
-SHA256 (rust/rustc-1.22.1-src.tar.gz) = 
i3pCvdbrIFqMUz60G1xCOJqIFY0GCu0eD0YfaMH9P9M=
-SHA256 (rust/rustc-bootstrap-amd64-1.22.0-20171121.tar.gz) = 
SBeEKS/rfrQTNriS3/neoiQ+8yeolU5kPE99A06vz7s=
-SHA256 (rust/rustc-bootstrap-i386-1.22.1-20171125.tar.gz) = 
xwA7caAZJfqO/2SPaUP+iA0ktGnPaFKG+tuJCK2ixgE=
-SIZE (rust/rustc-1.22.1-src.tar.gz) = 54935620
-SIZE (rust/rustc-bootstrap-amd64-1.22.0-20171121.tar.gz) = 70165988
-SIZE (rust/rustc-bootstrap-i386-1.22.1-20171125.tar.gz) = 70668161
+SHA256 (rust/rustc-1.23.0-src.tar.gz) = 
dGSVOHHc/fqK/MU2kWpobdFWqDM52OxNXLTrL+FGy5E=
+SHA256 (rust/rustc-bootstrap-amd64-1.23.0-20180124.tar.gz) = 
C15P+JfoE6nuMD0u6WMxd5ipli+Tybr1u5u/WQrq/Sc=
+SHA256 (rust/rustc-bootstrap-i386-1.23.0-20180125.tar.gz) = 
dZuoJj8CW6+bXkmhgHLvzsP00k9fro1JZQaN1yaC1f4=
+SIZE (rust/rustc-1.23.0-src.tar.gz) = 60010149
+SIZE (rust/rustc-bootstrap-amd64-1.23.0-20180124.tar.gz) = 74050566
+SIZE (rust/rustc-bootstrap-i386-1.23.0-20180125.tar.gz) = 75732565
Index: patches/patch-src_bootstrap_bin_rustc_rs
===
RCS file: patches/patch-src_bootstrap_bin_rustc_rs
diff -N patches/patch-src_bootstrap_bin_rustc_rs
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_bootstrap_bin_rustc_rs25 Jan 2018 13:52:18 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+try to reduce memory usage on i386:
+ - small code size to optimize (more codegen-units)
+ - optimization level to 1 (instead of 2) to reduce the work in memory
+Index: src/bootstrap/bin/rustc.rs
+--- src/bootstrap/bin/rustc.rs.orig
 src/bootstrap/bin/rustc.rs
+@@ -183,6 +183,11 @@ fn main() {
+ cmd.arg("-C").arg(format!("codegen-units={}", s));
+ }
+ 
++if target.contains("i686-unknown-openbsd") && crate_name == "rustc" {
++cmd.arg("-C").arg("codegen-units=16")
++   .arg("-C").arg("opt-level=1");
++}
++
+ // Emit save-analysis info.
+ if env::var("RUSTC_SAVE_ANALYSIS") == Ok("api".to_string()) {
+ cmd.arg("-Zsave-analysis");
Index: patches/patch-src_bootstrap_dist_rs
===
RCS file: /cvs/ports/lang/rust/patches/patch-src_bootstrap_dist_rs,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_bootstrap_dist_rs
--- patches/patch-src_bootstrap_dist_rs 4 Dec 2017 17:31:49 -   1.1
+++ patches/patch-src_bootstrap_dist_rs 25 Jan 2018 13:52:18 -
@@ -5,7 +5,7 

Re: [update] lang/rust 1.20

[Daniel Jakots]

On Sat, 2 Sep 2017 11:48:18 +0200, Sebastien Marie 
wrote:

> Here an update for lang/rust 1.20

Committed, thanks!

[update] lang/rust 1.20

[Sebastien Marie]

Hi,

Here an update for lang/rust 1.20

Elements ports-wise:

- gnu module is included in order to workaround some random pickup
  of g* tool by build of libbacktrace (for backtrace-sys crate)

- I set PATCHORIG to workaround lot of .orig files included in source
  tarball

- a patch for curl-sys crate to not build libcurl but use the one in
  ports.

- but libzma-sys crate still build xz library (the same kind of patch
  that curl-sys didn't work). as it is just use at build time (for
  generating .tar.xz archives we don't use) I think it is acceptable.

Tested on amd64 and i386.

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile29 Aug 2017 11:36:19 -  1.50
+++ Makefile2 Sep 2017 09:29:17 -
@@ -8,19 +8,18 @@ DPB_PROPERTIES =  parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.19.0
-CARGO_V =  0.20.0
+V =1.20.0
+CARGO_V =  0.21.0
 DISTNAME = rustc-${V}-src
 
 # rustc bootstrap version
-BV-amd64 = 1.19.0-20170721
-BV-i386 =  1.19.0-20170721
+BV-amd64 = 1.20.0-20170829
+BV-i386 =  1.20.0-20170901
 BV =   ${BV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
 PKGNAME-main = rust-${V}
 PKGNAME-doc =  rust-doc-${V}
-REVISION-main =1
 
 MULTI_PACKAGES =   -main -doc
 
@@ -60,7 +59,8 @@ PKG_ARGS +=   -Damd64=0 -Di386=1
 .endif
 
 MODULES += gcc4 \
-   lang/python
+   lang/python \
+   gnu
 MODPY_RUNDEP = No
 
 BUILD_DEPENDS +=   devel/cmake
@@ -71,8 +71,8 @@ BUILD_DEPENDS +=  devel/cmake
 BUILD_DEPENDS +=   devel/ninja
 .endif
 
-LIB_DEPENDS += net/curl \
-   devel/libgit2/libgit2 \
+LIB_DEPENDS += devel/libgit2/libgit2 \
+   net/curl \
security/libssh2
 
 # libgcc.a path
@@ -93,6 +93,7 @@ MAKE_ENV =RUSTFLAGS="-L ${WRKDIR}/modg
LIBGIT2_SYS_USE_PKG_CONFIG=1
 
 # build/configuration variables
+PATCHORIG =.openbsd.orig
 SEPARATE_BUILD =   Yes
 USE_GMAKE =Yes
 
@@ -117,12 +118,12 @@ TEST_TARGET ?=src/test/run-pass \
src/test/run-fail/pretty \
path/to/nowhere
 
-# - disable vendor checksum check on openssl-sys (as we patched it)
+# - disable vendor checksum checks
 # - SUBSTR cargo testsuite
 SUBST_VARS +=  WRKBUILD
 post-patch:
sed -ie 's/"files":{[^}]*}/"files":{}/' \
-   "${WRKSRC}/src/vendor/openssl-sys/.cargo-checksum.json"
+   ${WRKSRC}/src/vendor/*/.cargo-checksum.json
${SUBST_CMD} ${WRKSRC}/src/tools/cargo/tests/cargotest/support/paths.rs
 
 # - check datasize limit before configuring (and building)
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo31 Jul 2017 13:19:13 -  1.26
+++ distinfo2 Sep 2017 09:29:17 -
@@ -1,6 +1,6 @@
-SHA256 (rust/rustc-1.19.0-src.tar.gz) = 
FSMfUFP7cq2CvpH1q/1qpgy3iYxQieTxrFkQpzEJDFE=
-SHA256 (rust/rustc-bootstrap-amd64-1.19.0-20170721.tar.gz) = 
OIXGymWIx8k57zH1UQRx6WvevMw2kEDBRlvdlErKNbM=
-SHA256 (rust/rustc-bootstrap-i386-1.19.0-20170721.tar.gz) = 
imXJ+9THpwwadNHaYJiISj3vo+fowJeYWvmal0/MpnM=
-SIZE (rust/rustc-1.19.0-src.tar.gz) = 50108626
-SIZE (rust/rustc-bootstrap-amd64-1.19.0-20170721.tar.gz) = 69399327
-SIZE (rust/rustc-bootstrap-i386-1.19.0-20170721.tar.gz) = 70816328
+SHA256 (rust/rustc-1.20.0-src.tar.gz) = 
KqSHX/RHLG41Jiu7kFLLJiPaPa5ghKhYzFnTbzPxghQ=
+SHA256 (rust/rustc-bootstrap-amd64-1.20.0-20170829.tar.gz) = 
U/r7RegARHYD/cr/CK3SPW7f9zabUjGEG8hGTw+b3sI=
+SHA256 (rust/rustc-bootstrap-i386-1.20.0-20170901.tar.gz) = 
QL7KVxDomuN+rKq6HYFrluEExkWGQQvVU4QCpUKOAUg=
+SIZE (rust/rustc-1.20.0-src.tar.gz) = 50418082
+SIZE (rust/rustc-bootstrap-amd64-1.20.0-20170829.tar.gz) = 71871340
+SIZE (rust/rustc-bootstrap-i386-1.20.0-20170901.tar.gz) = 73475997
Index: patches/patch-src_bootstrap_lib_rs
===
RCS file: /cvs/ports/lang/rust/patches/patch-src_bootstrap_lib_rs,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_bootstrap_lib_rs
--- patches/patch-src_bootstrap_lib_rs  31 Jul 2017 13:19:13 -  1.5
+++ patches/patch-src_bootstrap_lib_rs  2 Sep 2017 09:29:17 -
@@ -3,7 +3,7 @@ Let us compilation choice to be honored.
 Index: src/bootstrap/lib.rs
 --- src/bootstrap/lib.rs.orig
 +++ src/bootstrap/lib.rs
-@@ -828,7 +828,6 @@ impl Build {
+@@ -857,7 +857,6 @@ impl Build {
  // gcc-rs because the 

Re: update: lang/rust 1.19.0

[Sebastien Marie]

On Sat, Jul 22, 2017 at 02:09:17PM +0200, Sebastien Marie wrote:
> Hi,
> 
> The following diff updates rustc to 1.19.0.
> 

updated diff to be in sync with latest changes on lang/rust.

Thanks.
-- 
Sebastien Marie

Index: devel/Makefile
===
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1628
diff -u -p -r1.1628 Makefile
--- devel/Makefile  17 Jul 2017 00:24:11 -  1.1628
+++ devel/Makefile  22 Jul 2017 12:07:17 -
@@ -50,7 +50,6 @@
  SUBDIR += capstone
  SUBDIR += catalyst
  SUBDIR += catalyst-tutorial
- SUBDIR += cargo
  SUBDIR += cargo-generate-vendor
  SUBDIR += cbmc
  SUBDIR += ccache
Index: devel/cargo/Makefile
===
RCS file: devel/cargo/Makefile
diff -N devel/cargo/Makefile
--- devel/cargo/Makefile17 Jun 2017 02:08:10 -  1.14
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,215 +0,0 @@
-# $OpenBSD: Makefile,v 1.14 2017/06/17 02:08:10 danj Exp $
-COMMENT = package manager for Rust language
-
-ONLY_FOR_ARCHS =   amd64 i386
-
-# cargo version
-CARGO_VERSION =0.19.0
-RUSTC_VERSION =1.18.0
-
-# cargo version used for bootstrapping
-BV-amd64 = 0.19.0-20170611
-BV-i386 =  0.19.0-20170611
-BOOTSTRAP_VERSION =${BV-${MACHINE_ARCH}}
-
-PKGNAME =  cargo-${CARGO_VERSION}
-DISTNAME = rustc-${RUSTC_VERSION}-src
-CATEGORIES =   devel
-
-HOMEPAGE = https://doc.crates.io/
-
-MAINTAINER =   Sebastien Marie 
-
-DIST_SUBDIR =  rust
-MODCARGO_DIST_SUBDIR = ../cargo
-
-# cargo is dual licensed MIT/Apache-2.0
-# third-parties (detail below):
-#  - MIT
-#  - Unlicense/MIT
-#  - MIT/Apache-2.0
-#
-PERMIT_PACKAGE_CDROM = Yes
-
-WANTLIB = c crypto curl git2 m pthread ssh2 ssl
-
-MODCARGO_CRATES += advapi32-sys-0.2.0  # MIT
-MODCARGO_CRATES += aho-corasick-0.5.3  # Unlicense/MIT
-MODCARGO_CRATES += aho-corasick-0.6.3  # Unlicense/MIT
-MODCARGO_CRATES += bitflags-0.7.0  # MIT/Apache-2.0
-MODCARGO_CRATES += bufstream-0.1.2 # MIT/Apache-2.0
-MODCARGO_CRATES += cfg-if-0.1.0# MIT/Apache-2.0
-MODCARGO_CRATES += chrono-0.2.25   # MIT/Apache-2.0
-MODCARGO_CRATES += cmake-0.1.22# MIT/Apache-2.0
-MODCARGO_CRATES += crossbeam-0.2.10# Apache-2.0/MIT
-MODCARGO_CRATES += curl-0.4.6  # MIT
-MODCARGO_CRATES += curl-sys-0.3.10 # MIT
-MODCARGO_CRATES += docopt-0.7.0# Unlicense/MIT
-MODCARGO_CRATES += dtoa-0.4.1  # MIT/Apache-2.0
-MODCARGO_CRATES += env_logger-0.4.2# MIT/Apache-2.0
-MODCARGO_CRATES += filetime-0.1.10 # MIT/Apache-2.0
-MODCARGO_CRATES += flate2-0.2.17   # MIT/Apache-2.0
-MODCARGO_CRATES += foreign-types-0.2.0 # MIT/Apache-2.0
-MODCARGO_CRATES += fs2-0.4.1   # MIT/Apache-2.0
-MODCARGO_CRATES += gcc-0.3.45  # MIT/Apache-2.0
-MODCARGO_CRATES += gdi32-sys-0.2.0 # MIT
-MODCARGO_CRATES += git2-0.6.4  # MIT/Apache-2.0
-MODCARGO_CRATES += git2-curl-0.7.0 # MIT/Apache-2.0
-MODCARGO_CRATES += glob-0.2.11 # MIT/Apache-2.0
-MODCARGO_CRATES += hamcrest-0.1.1  # MIT/Apache-2.0
-MODCARGO_CRATES += idna-0.1.0  # MIT/Apache-2.0
-MODCARGO_CRATES += itoa-0.3.1  # MIT/Apache-2.0
-MODCARGO_CRATES += kernel32-sys-0.2.2  # MIT
-MODCARGO_CRATES += lazy_static-0.2.5   # MIT
-MODCARGO_CRATES += libc-0.2.21 # MIT/Apache-2.0
-MODCARGO_CRATES += libgit2-sys-0.6.7   # MIT/Apache-2.0
-MODCARGO_CRATES += libssh2-sys-0.2.5   # MIT/Apache-2.0
-MODCARGO_CRATES += libz-sys-1.0.13 # MIT/Apache-2.0
-MODCARGO_CRATES += log-0.3.7   # MIT/Apache-2.0
-MODCARGO_CRATES += matches-0.1.4   # MIT
-MODCARGO_CRATES += memchr-0.1.11   # Unlicense/MIT
-MODCARGO_CRATES += memchr-1.0.1# Unlicense/MIT
-MODCARGO_CRATES += miniz-sys-0.1.9 # MIT/Apache-2.0
-MODCARGO_CRATES += miow-0.2.1  # MIT/Apache-2.0
-MODCARGO_CRATES += net2-0.2.27 # MIT/Apache-2.0
-MODCARGO_CRATES += num-0.1.37  # MIT/Apache-2.0
-MODCARGO_CRATES += num-bigint-0.1.37   # MIT/Apache-2.0
-MODCARGO_CRATES += num-iter-0.1.33 # MIT/Apache-2.0
-MODCARGO_CRATES += num-complex-0.1.36  # MIT/Apache-2.0
-MODCARGO_CRATES += num-integer-0.1.33  # MIT/Apache-2.0
-MODCARGO_CRATES += num-rational-0.1.36 # MIT/Apache-2.0
-MODCARGO_CRATES += num-traits-0.1.37   # MIT/Apache-2.0
-MODCARGO_CRATES += num_cpus-1.3.0  # MIT/Apache-2.0
-MODCARGO_CRATES += openssl-0.9.10  # Apache-2.0
-MODCARGO_CRATES += openssl-probe-0.1.1 # MIT/Apache-2.0
-MODCARGO_CRATES += openssl-sys-0.9.10  # MIT
-MODCARGO_CRATES += pkg-config-0.3.9# MIT/Apache-2.0
-MODCARGO_CRATES += psapi-sys-0.1.0 # MIT
-MODCARGO_CRATES += quote-0.3.15# MIT/Apache-2.0
-MODCARGO_CRATES += rand-0.3.15 # MIT/Apache-2.0

update: lang/rust 1.19.0

[Sebastien Marie]

Hi,

The following diff updates rustc to 1.19.0.

It does several things:
  - merge devel/cargo to lang/rust : they are both released in the same
tarball, and this release makes cargo to be buildable without
network.

  - so we drop devel/cargo package. I hope to have the right things in
PLIST and in quirks 
  
  - www/mozilla-firefox is updated to just BUILD_DEPENDS on lang/rust.

I tested the update on amd64 and i386.
-- 
Sebastien Marie

Index: devel/Makefile
===
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1628
diff -u -p -r1.1628 Makefile
--- devel/Makefile  17 Jul 2017 00:24:11 -  1.1628
+++ devel/Makefile  22 Jul 2017 12:07:17 -
@@ -50,7 +50,6 @@
  SUBDIR += capstone
  SUBDIR += catalyst
  SUBDIR += catalyst-tutorial
- SUBDIR += cargo
  SUBDIR += cargo-generate-vendor
  SUBDIR += cbmc
  SUBDIR += ccache
Index: devel/cargo/Makefile
===
RCS file: devel/cargo/Makefile
diff -N devel/cargo/Makefile
--- devel/cargo/Makefile17 Jun 2017 02:08:10 -  1.14
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,215 +0,0 @@
-# $OpenBSD: Makefile,v 1.14 2017/06/17 02:08:10 danj Exp $
-COMMENT = package manager for Rust language
-
-ONLY_FOR_ARCHS =   amd64 i386
-
-# cargo version
-CARGO_VERSION =0.19.0
-RUSTC_VERSION =1.18.0
-
-# cargo version used for bootstrapping
-BV-amd64 = 0.19.0-20170611
-BV-i386 =  0.19.0-20170611
-BOOTSTRAP_VERSION =${BV-${MACHINE_ARCH}}
-
-PKGNAME =  cargo-${CARGO_VERSION}
-DISTNAME = rustc-${RUSTC_VERSION}-src
-CATEGORIES =   devel
-
-HOMEPAGE = https://doc.crates.io/
-
-MAINTAINER =   Sebastien Marie 
-
-DIST_SUBDIR =  rust
-MODCARGO_DIST_SUBDIR = ../cargo
-
-# cargo is dual licensed MIT/Apache-2.0
-# third-parties (detail below):
-#  - MIT
-#  - Unlicense/MIT
-#  - MIT/Apache-2.0
-#
-PERMIT_PACKAGE_CDROM = Yes
-
-WANTLIB = c crypto curl git2 m pthread ssh2 ssl
-
-MODCARGO_CRATES += advapi32-sys-0.2.0  # MIT
-MODCARGO_CRATES += aho-corasick-0.5.3  # Unlicense/MIT
-MODCARGO_CRATES += aho-corasick-0.6.3  # Unlicense/MIT
-MODCARGO_CRATES += bitflags-0.7.0  # MIT/Apache-2.0
-MODCARGO_CRATES += bufstream-0.1.2 # MIT/Apache-2.0
-MODCARGO_CRATES += cfg-if-0.1.0# MIT/Apache-2.0
-MODCARGO_CRATES += chrono-0.2.25   # MIT/Apache-2.0
-MODCARGO_CRATES += cmake-0.1.22# MIT/Apache-2.0
-MODCARGO_CRATES += crossbeam-0.2.10# Apache-2.0/MIT
-MODCARGO_CRATES += curl-0.4.6  # MIT
-MODCARGO_CRATES += curl-sys-0.3.10 # MIT
-MODCARGO_CRATES += docopt-0.7.0# Unlicense/MIT
-MODCARGO_CRATES += dtoa-0.4.1  # MIT/Apache-2.0
-MODCARGO_CRATES += env_logger-0.4.2# MIT/Apache-2.0
-MODCARGO_CRATES += filetime-0.1.10 # MIT/Apache-2.0
-MODCARGO_CRATES += flate2-0.2.17   # MIT/Apache-2.0
-MODCARGO_CRATES += foreign-types-0.2.0 # MIT/Apache-2.0
-MODCARGO_CRATES += fs2-0.4.1   # MIT/Apache-2.0
-MODCARGO_CRATES += gcc-0.3.45  # MIT/Apache-2.0
-MODCARGO_CRATES += gdi32-sys-0.2.0 # MIT
-MODCARGO_CRATES += git2-0.6.4  # MIT/Apache-2.0
-MODCARGO_CRATES += git2-curl-0.7.0 # MIT/Apache-2.0
-MODCARGO_CRATES += glob-0.2.11 # MIT/Apache-2.0
-MODCARGO_CRATES += hamcrest-0.1.1  # MIT/Apache-2.0
-MODCARGO_CRATES += idna-0.1.0  # MIT/Apache-2.0
-MODCARGO_CRATES += itoa-0.3.1  # MIT/Apache-2.0
-MODCARGO_CRATES += kernel32-sys-0.2.2  # MIT
-MODCARGO_CRATES += lazy_static-0.2.5   # MIT
-MODCARGO_CRATES += libc-0.2.21 # MIT/Apache-2.0
-MODCARGO_CRATES += libgit2-sys-0.6.7   # MIT/Apache-2.0
-MODCARGO_CRATES += libssh2-sys-0.2.5   # MIT/Apache-2.0
-MODCARGO_CRATES += libz-sys-1.0.13 # MIT/Apache-2.0
-MODCARGO_CRATES += log-0.3.7   # MIT/Apache-2.0
-MODCARGO_CRATES += matches-0.1.4   # MIT
-MODCARGO_CRATES += memchr-0.1.11   # Unlicense/MIT
-MODCARGO_CRATES += memchr-1.0.1# Unlicense/MIT
-MODCARGO_CRATES += miniz-sys-0.1.9 # MIT/Apache-2.0
-MODCARGO_CRATES += miow-0.2.1  # MIT/Apache-2.0
-MODCARGO_CRATES += net2-0.2.27 # MIT/Apache-2.0
-MODCARGO_CRATES += num-0.1.37  # MIT/Apache-2.0
-MODCARGO_CRATES += num-bigint-0.1.37   # MIT/Apache-2.0
-MODCARGO_CRATES += num-iter-0.1.33 # MIT/Apache-2.0
-MODCARGO_CRATES += num-complex-0.1.36  # MIT/Apache-2.0
-MODCARGO_CRATES += num-integer-0.1.33  # MIT/Apache-2.0
-MODCARGO_CRATES += num-rational-0.1.36 # MIT/Apache-2.0
-MODCARGO_CRATES += num-traits-0.1.37   # MIT/Apache-2.0
-MODCARGO_CRATES += num_cpus-1.3.0  # MIT/Apache-2.0
-MODCARGO_CRATES += openssl-0.9.10  # Apache-2.0
-MODCARGO_CRATES += openssl-probe-0.1.1 # MIT/Apache-2.0
-MODCARGO_CRATES += openssl-sys-0.9.10 

update: lang/rust and devel/cargo

[Sebastien Marie]

Hi,

Here two diffs for:
  - lang/rust
  - devel/cargo

I expect the next release to collapse the two ports in one port with
subpackages. For this one, it is more simple to keep them separated.

As usually now, some changes in packaging: I embedded rustdoc in the
bootstrap. It bothers me, but it requires to much patches in source tree
to make the docs to depend of just built rustdoc binary (instead of one
from external).

Note I have also a WIP for building with cc=clang (base clang). It
requires to switch back to embedded llvm, and in rustc 1.18.0 it is
still based on LLVM 3.9.

Tests done under amd64:
  - lang/rust passes all the testsuite
  - devel/cargo is able to compile external program
  - textproc/ripgrep is buildable and passes it testsuite
  - www/mozilla-firefox is buildable
  - mozilla-central trunk (from some days/weeks ago) is also buildable

Tests done under i386:
  - lang/rust passes all the testsuite
  - devel/cargo is able to compile external program
  - textproc/ripgrep is buildable and passes it testsuite
  - www/mozilla-firefox is buildable

Thanks.
-- 
Sebastien Marie
Index: Makefile
===
RCS file: /cvs/ports/devel/cargo/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile19 May 2017 10:10:27 -  1.13
+++ Makefile12 Jun 2017 06:56:28 -
@@ -4,12 +4,12 @@ COMMENT = package manager for Rust langu
 ONLY_FOR_ARCHS =   amd64 i386
 
 # cargo version
-CARGO_VERSION =0.18.0
-RUSTC_VERSION =1.17.0
+CARGO_VERSION =0.19.0
+RUSTC_VERSION =1.18.0
 
 # cargo version used for bootstrapping
-BV-amd64 = 0.18.0-20170426
-BV-i386 =  0.18.0-20170426
+BV-amd64 = 0.19.0-20170611
+BV-i386 =  0.19.0-20170611
 BOOTSTRAP_VERSION =${BV-${MACHINE_ARCH}}
 
 PKGNAME =  cargo-${CARGO_VERSION}
@@ -43,7 +43,7 @@ MODCARGO_CRATES +=chrono-0.2.25   # MIT/A
 MODCARGO_CRATES += cmake-0.1.22# MIT/Apache-2.0
 MODCARGO_CRATES += crossbeam-0.2.10# Apache-2.0/MIT
 MODCARGO_CRATES += curl-0.4.6  # MIT
-MODCARGO_CRATES += curl-sys-0.3.11 # MIT
+MODCARGO_CRATES += curl-sys-0.3.10 # MIT
 MODCARGO_CRATES += docopt-0.7.0# Unlicense/MIT
 MODCARGO_CRATES += dtoa-0.4.1  # MIT/Apache-2.0
 MODCARGO_CRATES += env_logger-0.4.2# MIT/Apache-2.0
@@ -62,7 +62,7 @@ MODCARGO_CRATES +=itoa-0.3.1  # MIT/Apac
 MODCARGO_CRATES += kernel32-sys-0.2.2  # MIT
 MODCARGO_CRATES += lazy_static-0.2.5   # MIT
 MODCARGO_CRATES += libc-0.2.21 # MIT/Apache-2.0
-MODCARGO_CRATES += libgit2-sys-0.6.8   # MIT/Apache-2.0
+MODCARGO_CRATES += libgit2-sys-0.6.7   # MIT/Apache-2.0
 MODCARGO_CRATES += libssh2-sys-0.2.5   # MIT/Apache-2.0
 MODCARGO_CRATES += libz-sys-1.0.13 # MIT/Apache-2.0
 MODCARGO_CRATES += log-0.3.7   # MIT/Apache-2.0
@@ -81,7 +81,7 @@ MODCARGO_CRATES +=num-rational-0.1.36 #
 MODCARGO_CRATES += num-traits-0.1.37   # MIT/Apache-2.0
 MODCARGO_CRATES += num_cpus-1.3.0  # MIT/Apache-2.0
 MODCARGO_CRATES += openssl-0.9.10  # Apache-2.0
-MODCARGO_CRATES += openssl-probe-0.1.0 # MIT/Apache-2.0
+MODCARGO_CRATES += openssl-probe-0.1.1 # MIT/Apache-2.0
 MODCARGO_CRATES += openssl-sys-0.9.10  # MIT
 MODCARGO_CRATES += pkg-config-0.3.9# MIT/Apache-2.0
 MODCARGO_CRATES += psapi-sys-0.1.0 # MIT
@@ -104,7 +104,7 @@ MODCARGO_CRATES +=  shell-escape-0.1.3  # 
 MODCARGO_CRATES += strsim-0.6.0# MIT
 MODCARGO_CRATES += syn-0.11.9  # MIT/Apache-2.0
 MODCARGO_CRATES += synom-0.11.3# MIT/Apache-2.0
-MODCARGO_CRATES += tar-0.4.11  # MIT/Apache-2.0
+MODCARGO_CRATES += tar-0.4.10  # MIT/Apache-2.0
 MODCARGO_CRATES += tempdir-0.3.5   # MIT/Apache-2.0
 MODCARGO_CRATES += term-0.4.5  # MIT/Apache-2.0
 MODCARGO_CRATES += thread-id-2.0.0 # Apache-2.0
@@ -112,7 +112,7 @@ MODCARGO_CRATES +=  thread-id-3.0.0 # Apa
 MODCARGO_CRATES += thread_local-0.2.7  # Apache-2.0/MIT
 MODCARGO_CRATES += thread_local-0.3.3  # Apache-2.0/MIT
 MODCARGO_CRATES += time-0.1.36 # MIT/Apache-2.0
-MODCARGO_CRATES += toml-0.3.1  # MIT/Apache-2.0
+MODCARGO_CRATES += toml-0.3.2  # MIT/Apache-2.0
 MODCARGO_CRATES += unicode-bidi-0.2.5  # MIT / Apache-2.0
 MODCARGO_CRATES += unicode-normalization-0.1.4 # MIT/Apache-2.0
 MODCARGO_CRATES += unicode-xid-0.0.4   # MIT/Apache-2.0
Index: distinfo
===
RCS file: /cvs/ports/devel/cargo/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo5 May 2017 11:42:27 -   1.8
+++ distinfo12 Jun 2017 06:56:28 -
@@ -8,7 +8,7 @@ SHA256 (rust/../cargo/chrono-0.2.25.tar.
 SHA256 (rust/../cargo/cmake-0.1.22.tar.gz) = 

update: [lang/rust] makes clang happy with rustc

[Sebastien Marie]

Hi,

The following diff on lang/rust makes it more cooperative with clang.

It packages a link on libgcc.a, in order to let clang to found it. The
link is inside rust librairies subdir.

I copied the way used by lang/g77.

Once commited, I will provide diff to cargo to remove the requirement of
gcc4 module (and change my pending diff on ripgrep).

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile5 May 2017 11:40:29 -   1.42
+++ Makefile15 May 2017 13:14:16 -
@@ -9,6 +9,7 @@ COMMENT-main =  compiler for Rust Langua
 COMMENT-doc =  html documentation for rustc
 
 V =1.17.0
+REVISION = 0
 DISTNAME = rustc-${V}-src
 
 # rustc bootstrap version
@@ -73,6 +74,11 @@ MODPY_RUNDEP =   No
 BUILD_DEPENDS +=   devel/llvm \
devel/cmake
 
+# libgcc.a path
+CONFIG =   ${MACHINE_ARCH}-unknown-openbsd${OSREV}
+SYSV = 4.2.1
+SYSLIBPATH =   /usr/lib/gcc-lib/${CONFIG}/${SYSV}
+
 # rustllvm need c++11
 MODGCC4_LANGS =c++
 MODGCC4_ARCHS =*   # patches required for base clang
@@ -183,6 +189,9 @@ post-install:

${PREFIX}/lib/rustlib/{install.log,uninstall.sh,rust-installer-version} \
${PREFIX}/lib/rustlib/components \
${PREFIX}/lib/rustlib/manifest-*
+   # make a link to libgcc.a inside rustlib
+   ln -fs ${SYSLIBPATH}/libgcc.a \
+   ${PREFIX}/lib/rustlib/${TRIPLE_ARCH}/lib
 
 do-test:
${BUILD_BIN} test --verbose --jobs=${MAKE_JOBS} ${TEST_TARGET}
Index: pkg/PFRAG.amd64-main
===
RCS file: /cvs/ports/lang/rust/pkg/PFRAG.amd64-main,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.amd64-main
--- pkg/PFRAG.amd64-main5 May 2017 11:40:29 -   1.3
+++ pkg/PFRAG.amd64-main15 May 2017 13:14:16 -
@@ -47,6 +47,7 @@ lib/rustlib/x86_64-unknown-openbsd/lib/l
 lib/rustlib/x86_64-unknown-openbsd/lib/libcore-082780785615d424.rlib
 lib/rustlib/x86_64-unknown-openbsd/lib/libflate-f8dd427e4b8c5b4c.so
 lib/rustlib/x86_64-unknown-openbsd/lib/libfmt_macros-448396db99515941.so
+lib/rustlib/x86_64-unknown-openbsd/lib/libgcc.a
 lib/rustlib/x86_64-unknown-openbsd/lib/libgetopts-dd68a95b56420ce2.rlib
 lib/rustlib/x86_64-unknown-openbsd/lib/libgetopts-dd68a95b56420ce2.so
 lib/rustlib/x86_64-unknown-openbsd/lib/libgraphviz-0c715aa7b22d8559.so
Index: pkg/PFRAG.i386-main
===
RCS file: /cvs/ports/lang/rust/pkg/PFRAG.i386-main,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.i386-main
--- pkg/PFRAG.i386-main 5 May 2017 11:40:29 -   1.3
+++ pkg/PFRAG.i386-main 15 May 2017 13:14:16 -
@@ -47,6 +47,7 @@ lib/rustlib/i686-unknown-openbsd/lib/lib
 lib/rustlib/i686-unknown-openbsd/lib/libcore-84e6a2caa4fb3d55.rlib
 lib/rustlib/i686-unknown-openbsd/lib/libflate-b7e6eb08021d17dd.so
 lib/rustlib/i686-unknown-openbsd/lib/libfmt_macros-52ed932153d68799.so
+lib/rustlib/i686-unknown-openbsd/lib/libgcc.a
 lib/rustlib/i686-unknown-openbsd/lib/libgetopts-8af7689ae63241f7.rlib
 lib/rustlib/i686-unknown-openbsd/lib/libgetopts-8af7689ae63241f7.so
 lib/rustlib/i686-unknown-openbsd/lib/libgraphviz-b32814278f223978.so

Re: [update] lang/rust 1.17.0

[Sebastien Marie]

On Fri, Apr 28, 2017 at 05:01:34PM +0100, Edd Barrett wrote:
> On Fri, Apr 28, 2017 at 12:16:09PM +0200, Sebastien Marie wrote:
> > Thanks for catching it edd@ !
> 
> No worries!
> 
> I've now managed to update rust and cargo. I think I've found a
> regression in cargo here:
> 
> ---8<---
> wilfred> rm -rf ~/.cargo 
> wilfred> cargo install --verbose rustfmt
>
[...]
> error: failed to compile `rustfmt v0.8.3`, intermediate artifacts can be 
> found at `/tmp/cargo-install.Z19N6YGnaln6`
> 
> Caused by:
>   couldn't get the path to cargo executable
> 
> Caused by:
>   no current exe available (short)

it seems cargo start to use env::current_exe() function. It is
unsupported under OpenBSD (specially when argv[0] contains just "cargo"
and not a full path).

So I replaced the inconditional use of env::current_exe() with a
fallback to ${LOCALBASE}/bin/cargo. We already have similar workaround
inside rustc.

FYI, there is also an issue with cargo 0.18.0 and firefox 53. See
https://bugzilla.mozilla.org/show_bug.cgi?id=1360521. The behaviour of
cargo changed regarding 'build.rs' execution (build-time configuration
program).

Thanks for the deeper checks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/devel/cargo/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile15 Feb 2017 12:49:42 -  1.11
+++ Makefile29 Apr 2017 04:45:31 -
@@ -4,27 +4,24 @@ COMMENT = package manager for Rust langu
 ONLY_FOR_ARCHS =   amd64 i386
 
 # cargo version
-CARGO_VERSION =0.16.0
+CARGO_VERSION =0.18.0
+RUSTC_VERSION =1.17.0
 
 # cargo version used for bootstrapping
-BV-amd64 = 0.16.0-20170213
-BV-i386 =  0.16.0-20170213
+BV-amd64 = 0.18.0-20170426
+BV-i386 =  0.18.0-20170426
 BOOTSTRAP_VERSION =${BV-${MACHINE_ARCH}}
 
-# rust-install submodule version in cargo/src/rust-installer
-# see https://github.com/rust-lang/cargo/tree/${CARGO_VERSION}/src
-RUSTINSTALL_INDEX =4f994850808a572e2cc8d43f968893c8e942e9bf
-
-
-DISTNAME = cargo-${CARGO_VERSION}
+PKGNAME =  cargo-${CARGO_VERSION}
+DISTNAME = rustc-${RUSTC_VERSION}-src
 CATEGORIES =   devel
 
 HOMEPAGE = https://doc.crates.io/
 
 MAINTAINER =   Sebastien Marie 
 
-DIST_SUBDIR =  cargo
-MODCARGO_DIST_SUBDIR =
+DIST_SUBDIR =  rust
+MODCARGO_DIST_SUBDIR = ../cargo
 
 # cargo is dual licensed MIT/Apache-2.0
 # third-parties (detail below):
@@ -36,85 +33,103 @@ PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB = c crypto curl git2 m pthread ssh2 ssl z
 
-MASTER_SITES = https://github.com/rust-lang/
-DISTFILES +=   
cargo-${CARGO_VERSION}.tar.gz{cargo/archive/${CARGO_VERSION}.tar.gz}
-DISTFILES +=   
rust-installer-${RUSTINSTALL_INDEX}.tar.gz{rust-installer/archive/${RUSTINSTALL_INDEX}.tar.gz}
-
 MODCARGO_CRATES += advapi32-sys-0.2.0  # MIT
 MODCARGO_CRATES += aho-corasick-0.5.3  # Unlicense/MIT
+MODCARGO_CRATES += aho-corasick-0.6.3  # Unlicense/MIT
 MODCARGO_CRATES += bitflags-0.7.0  # MIT/Apache-2.0
 MODCARGO_CRATES += bufstream-0.1.2 # MIT/Apache-2.0
 MODCARGO_CRATES += cfg-if-0.1.0# MIT/Apache-2.0
-MODCARGO_CRATES += cmake-0.1.19# MIT/Apache-2.0
+MODCARGO_CRATES += chrono-0.2.25   # MIT/Apache-2.0
+MODCARGO_CRATES += cmake-0.1.22# MIT/Apache-2.0
 MODCARGO_CRATES += crossbeam-0.2.10# Apache-2.0/MIT
-MODCARGO_CRATES += curl-0.4.1  # MIT
-MODCARGO_CRATES += curl-sys-0.3.6  # MIT
-MODCARGO_CRATES += docopt-0.6.86   # Unlicense/MIT
-MODCARGO_CRATES += env_logger-0.3.5# MIT/Apache-2.0
+MODCARGO_CRATES += curl-0.4.6  # MIT
+MODCARGO_CRATES += curl-sys-0.3.11 # MIT
+MODCARGO_CRATES += docopt-0.7.0# Unlicense/MIT
+MODCARGO_CRATES += dtoa-0.4.1  # MIT/Apache-2.0
+MODCARGO_CRATES += env_logger-0.4.2# MIT/Apache-2.0
 MODCARGO_CRATES += filetime-0.1.10 # MIT/Apache-2.0
-MODCARGO_CRATES += flate2-0.2.14   # MIT/Apache-2.0
-MODCARGO_CRATES += fs2-0.3.0   # MIT/Apache-2.0
-MODCARGO_CRATES += gcc-0.3.39  # MIT/Apache-2.0
+MODCARGO_CRATES += flate2-0.2.17   # MIT/Apache-2.0
+MODCARGO_CRATES += foreign-types-0.2.0 # MIT/Apache-2.0
+MODCARGO_CRATES += fs2-0.4.1   # MIT/Apache-2.0
+MODCARGO_CRATES += gcc-0.3.45  # MIT/Apache-2.0
 MODCARGO_CRATES += gdi32-sys-0.2.0 # MIT
-MODCARGO_CRATES += git2-0.6.3  # MIT/Apache-2.0
+MODCARGO_CRATES += git2-0.6.4  # MIT/Apache-2.0
 MODCARGO_CRATES += git2-curl-0.7.0 # MIT/Apache-2.0
 MODCARGO_CRATES += glob-0.2.11 # MIT/Apache-2.0
 MODCARGO_CRATES += hamcrest-0.1.1  # MIT/Apache-2.0
 MODCARGO_CRATES += idna-0.1.0  # MIT/Apache-2.0
+MODCARGO_CRATES += itoa-0.3.1  # MIT/Apache-2.0
 MODCARGO_CRATES += kernel32-sys-0.2.2  # MIT
-MODCARGO_CRATES += lazy_static-0.2.2   # MIT

Re: [update] lang/rust 1.17.0

[Edd Barrett]

On Fri, Apr 28, 2017 at 12:16:09PM +0200, Sebastien Marie wrote:
> Thanks for catching it edd@ !

No worries!

I've now managed to update rust and cargo. I think I've found a
regression in cargo here:

---8<---
wilfred> rm -rf ~/.cargo 
wilfred> cargo install --verbose rustfmt
Updating registry `https://github.com/rust-lang/crates.io-index`
 Downloading rustfmt v0.8.3
  Installing rustfmt v0.8.3
 Downloading diff v0.1.10
 Downloading multimap v0.3.0
 Downloading toml v0.2.1
 Downloading rustc-serialize v0.3.24
 Downloading syntex_syntax v0.58.1
 Downloading unicode-segmentation v1.1.0
 Downloading log v0.3.7
 Downloading env_logger v0.4.2
 Downloading getopts v0.2.14
 Downloading term v0.4.5
 Downloading strings v0.0.1
 Downloading syntex_errors v0.58.1
 Downloading regex v0.2.1
 Downloading itertools v0.5.10
 Downloading syntex_pos v0.58.1
 Downloading bitflags v0.8.2
 Downloading unicode-xid v0.0.4
 Downloading libc v0.2.22
 Downloading regex-syntax v0.4.0
 Downloading thread_local v0.3.3
 Downloading utf8-ranges v1.0.0
 Downloading memchr v1.0.1
 Downloading aho-corasick v0.6.3
 Downloading unreachable v0.1.1
 Downloading void v1.0.2
 Downloading either v1.1.0
 Downloading walkdir v1.0.7
 Downloading same-file v0.1.3
 Downloading thread-id v3.0.0
error: failed to compile `rustfmt v0.8.3`, intermediate artifacts can be found 
at `/tmp/cargo-install.Z19N6YGnaln6`

Caused by:
  couldn't get the path to cargo executable

Caused by:
  no current exe available (short)
wilfred> which cargo
/usr/local/bin/cargo
wilfred> cargo -V
cargo 0.18.0
wilfred> rustc -V
rustc 1.17.0
--->8---

Something to do with the wrapper changes?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: [update] lang/rust 1.17.0

[Sebastien Marie]

On Fri, Apr 28, 2017 at 10:57:33AM +0100, Edd Barrett wrote:
> Hi Sebastien,
> 
> I got the sources fine, but I'm unable to get the cargo bootstrap:
> 
> >> Fetch 
> >> http://kapouay.odns.fr/pub/rust/cargo-bootstrap-amd64-0.18.0-20170426.tar.gz
> ftp: Error retrieving file: 404 Not Found
> 

hep, cargo bootstrap doesn't live in /pub/rust/ but in /pub/cargo/.

Below a new diff.

Thanks for catching it edd@ !
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile15 Apr 2017 19:41:36 -  1.41
+++ Makefile28 Apr 2017 10:14:39 -
@@ -8,17 +8,17 @@ DPB_PROPERTIES =  parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.16.0
+V =1.17.0
 DISTNAME = rustc-${V}-src
 
 # rustc bootstrap version
-RBV-amd64 =1.16.0-20160315
-RBV-i386 = 1.16.0-20170312
+RBV-amd64 =1.17.0-20170426
+RBV-i386 = 1.17.0-20170426
 RBV =  ${RBV-${MACHINE_ARCH}}
 
 # cargo bootstrap version
-CBV-amd64 =0.16.0-20170213
-CBV-i386 = 0.16.0-20170213
+CBV-amd64 =0.18.0-20170426
+CBV-i386 = 0.18.0-20170426
 CBV =  ${CBV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
@@ -41,6 +41,7 @@ WANTLIB-doc =
 
 MASTER_SITES = https://static.rust-lang.org/dist/
 MASTER_SITES0 =http://kapouay.odns.fr/pub/rust/
+MASTER_SITES1 =http://kapouay.odns.fr/pub/cargo/
 
 DIST_SUBDIR =  rust
 DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
@@ -51,7 +52,7 @@ RBOOTSTRAP =  ${RBOOTSTRAP-${MACHINE_ARC
 CBOOTSTRAP =   ${CBOOTSTRAP-${MACHINE_ARCH}}
 .for m in ${ONLY_FOR_ARCHS}
 RBOOTSTRAP-$m =rustc-bootstrap-${m}-${RBV-$m}.tar.gz:0
-CBOOTSTRAP-$m =../cargo/cargo-bootstrap-${m}-${CBV-$m}.tar.gz:0
+CBOOTSTRAP-$m =cargo-bootstrap-${m}-${CBV-$m}.tar.gz:1
 SUPDISTFILES +=${RBOOTSTRAP-$m} \
${CBOOTSTRAP-$m}
 .endfor
@@ -69,18 +70,12 @@ MODULES +=  gcc4 \
lang/python
 MODPY_RUNDEP = No
 
-# use embedded or ports version of LLVM
-PORTS_LLVM ?=  No
-.if ${PORTS_LLVM:L:Myes}
-BUILD_DEPENDS +=   devel/llvm<4
-.else
-BUILD_DEPENDS +=   devel/cmake \
-   devel/ninja
-.endif
+BUILD_DEPENDS +=   devel/llvm \
+   devel/cmake
 
 # rustllvm need c++11
 MODGCC4_LANGS =c++
-MODGCC4_ARCHS =*
+MODGCC4_ARCHS =*   # patches required for base clang
 
 # need to be keep in sync
 LIBESTDC_VERSION = 17.0
@@ -140,15 +135,9 @@ do-configure:
echo '[dist]' >>${WRKBUILD}/config.toml
echo 'src-tarball = false' >>${WRKBUILD}/config.toml
 
-.if ${PORTS_LLVM:L:Myes}
echo '[target.${TRIPLE_ARCH}]' >>${WRKBUILD}/config.toml
echo 'llvm-config = "${LOCALBASE}/bin/llvm-config"' \
>>${WRKBUILD}/config.toml
-.else
-   echo '[llvm]' >>${WRKBUILD}/config.toml
-   echo 'static-libstdcpp = false' >>${WRKBUILD}/config.toml
-   echo 'ninja = true' >>${WRKBUILD}/config.toml
-.endif
 
rm -rf ${WRKDIR}/modgcc-libs
mkdir -p ${WRKDIR}/modgcc-libs
@@ -158,8 +147,10 @@ do-configure:
 # hack to build doc using generated stage2 instead of with stage0
 # (rustdoc isn't included in our bootstrap)
 post-configure:
-   ln -fs ${WRKBUILD}/build/${TRIPLE_ARCH}/stage2/bin/rustdoc \
-   ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc
+   echo '#!/bin/sh' > 
${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc
+   echo 'LD_LIBRARY_PATH="${WRKBUILD}/build/${TRIPLE_ARCH}/stage2/lib" 
exec "${WRKBUILD}/build/${TRIPLE_ARCH}/stage2/bin/rustdoc" "$$@"' \
+   >> ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc
+   chmod 755 ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc
 
 BUILD_BIN = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
${MODPY_BIN} ${WRKSRC}/src/bootstrap/bootstrap.py
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo27 Mar 2017 12:35:31 -  1.23
+++ distinfo28 Apr 2017 10:14:39 -
@@ -1,10 +1,10 @@
-SHA256 (rust/../cargo/cargo-bootstrap-amd64-0.16.0-20170213.tar.gz) = 
lmzvwW5K+GVu+HHcB1Y54RrVbWDrqi/XucuMJO0jQws=
-SHA256 (rust/../cargo/cargo-bootstrap-i386-0.16.0-20170213.tar.gz) = 
BM+GckVYHmVQQkL4W02lZjUJtQyh1LbbataTVJ90Kzk=
-SHA256 (rust/rustc-1.16.0-src.tar.gz) = 
+WazHrHNm9LfgXw5GjOO61uSU64KGb+KEZYMVg+W6LQ=
-SHA256 (rust/rustc-bootstrap-amd64-1.16.0-20160315.tar.gz) = 

Re: [update] lang/rust 1.17.0

[Edd Barrett]

Hi Sebastien,

Again, thanks for working on Rust.

On Thu, Apr 27, 2017 at 08:49:03AM +0200, Sebastien Marie wrote:
>
> Please note that as the release isn't officially published at time of
> writing, MASTER_SITES should point to
> https://dev-static.rust-lang.org/dist/ to grab the tarball. Maybe we
> could add it as fallback to MASTER_SITES ?
> 
> MASTER_SITES =https://static.rust-lang.org/dist/ \
>   https://dev-static.rust-lang.org/dist/

I got the sources fine, but I'm unable to get the cargo bootstrap:

>> Fetch 
>> http://kapouay.odns.fr/pub/rust/cargo-bootstrap-amd64-0.18.0-20170426.tar.gz
ftp: Error retrieving file: 404 Not Found

Cheers

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

[update] lang/rust 1.17.0

[Sebastien Marie]

Hi,

It is time again: rust-1.17.0 will be released today.

Some changes in the port:
  - we go back to devel/llvm as now, rust-1.17.0 is able to use it.
I dropped local patches to embedded LLVM.

  - I annotated MODGCC4_ARCHS to explain why we keep it (some patches
are required to make rust to be compiled with base clang, mostly
regarding unwinding (switch from libgcc to libc++abi).

  - Changed a bit the wrapper for rustdoc. Mostly useful when working on
new port version and the bootstrap version differs than compiled
version.

The port has been compiled and tested on i386 and amd64 without
regression.

I also tested the build of devel/cargo (0.16.0 currently in tree) and
the upcoming 0.18.0 (see next mail).

Please note that as the release isn't officially published at time of
writing, MASTER_SITES should point to
https://dev-static.rust-lang.org/dist/ to grab the tarball. Maybe we
could add it as fallback to MASTER_SITES ?

MASTER_SITES =  https://static.rust-lang.org/dist/ \
https://dev-static.rust-lang.org/dist/

But I am unsure if the tarball will be kept on dev-static after
publishing...

Thanks.
-- 
Sebastien Marie

Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile15 Apr 2017 19:41:36 -  1.41
+++ Makefile27 Apr 2017 06:48:17 -
@@ -8,17 +8,17 @@ DPB_PROPERTIES =  parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.16.0
+V =1.17.0
 DISTNAME = rustc-${V}-src
 
 # rustc bootstrap version
-RBV-amd64 =1.16.0-20160315
-RBV-i386 = 1.16.0-20170312
+RBV-amd64 =1.17.0-20170426
+RBV-i386 = 1.17.0-20170426
 RBV =  ${RBV-${MACHINE_ARCH}}
 
 # cargo bootstrap version
-CBV-amd64 =0.16.0-20170213
-CBV-i386 = 0.16.0-20170213
+CBV-amd64 =0.18.0-20170426
+CBV-i386 = 0.18.0-20170426
 CBV =  ${CBV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
@@ -51,7 +51,7 @@ RBOOTSTRAP =  ${RBOOTSTRAP-${MACHINE_ARC
 CBOOTSTRAP =   ${CBOOTSTRAP-${MACHINE_ARCH}}
 .for m in ${ONLY_FOR_ARCHS}
 RBOOTSTRAP-$m =rustc-bootstrap-${m}-${RBV-$m}.tar.gz:0
-CBOOTSTRAP-$m =../cargo/cargo-bootstrap-${m}-${CBV-$m}.tar.gz:0
+CBOOTSTRAP-$m =cargo-bootstrap-${m}-${CBV-$m}.tar.gz:0
 SUPDISTFILES +=${RBOOTSTRAP-$m} \
${CBOOTSTRAP-$m}
 .endfor
@@ -69,18 +69,12 @@ MODULES +=  gcc4 \
lang/python
 MODPY_RUNDEP = No
 
-# use embedded or ports version of LLVM
-PORTS_LLVM ?=  No
-.if ${PORTS_LLVM:L:Myes}
-BUILD_DEPENDS +=   devel/llvm<4
-.else
-BUILD_DEPENDS +=   devel/cmake \
-   devel/ninja
-.endif
+BUILD_DEPENDS +=   devel/llvm \
+   devel/cmake
 
 # rustllvm need c++11
 MODGCC4_LANGS =c++
-MODGCC4_ARCHS =*
+MODGCC4_ARCHS =*   # patches required for base clang
 
 # need to be keep in sync
 LIBESTDC_VERSION = 17.0
@@ -140,15 +134,9 @@ do-configure:
echo '[dist]' >>${WRKBUILD}/config.toml
echo 'src-tarball = false' >>${WRKBUILD}/config.toml
 
-.if ${PORTS_LLVM:L:Myes}
echo '[target.${TRIPLE_ARCH}]' >>${WRKBUILD}/config.toml
echo 'llvm-config = "${LOCALBASE}/bin/llvm-config"' \
>>${WRKBUILD}/config.toml
-.else
-   echo '[llvm]' >>${WRKBUILD}/config.toml
-   echo 'static-libstdcpp = false' >>${WRKBUILD}/config.toml
-   echo 'ninja = true' >>${WRKBUILD}/config.toml
-.endif
 
rm -rf ${WRKDIR}/modgcc-libs
mkdir -p ${WRKDIR}/modgcc-libs
@@ -158,8 +146,10 @@ do-configure:
 # hack to build doc using generated stage2 instead of with stage0
 # (rustdoc isn't included in our bootstrap)
 post-configure:
-   ln -fs ${WRKBUILD}/build/${TRIPLE_ARCH}/stage2/bin/rustdoc \
-   ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc
+   echo '#!/bin/sh' > 
${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc
+   echo 'LD_LIBRARY_PATH="${WRKBUILD}/build/${TRIPLE_ARCH}/stage2/lib" 
exec "${WRKBUILD}/build/${TRIPLE_ARCH}/stage2/bin/rustdoc" "$$@"' \
+   >> ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc
+   chmod 755 ${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${RBV}/bin/rustdoc
 
 BUILD_BIN = cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
${MODPY_BIN} ${WRKSRC}/src/bootstrap/bootstrap.py
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo27 Mar 2017 12:35:31 -  1.23
+++ distinfo27 

Re: update: lang/rust to 1.16.0

[Sebastien Marie]

On Sun, Mar 26, 2017 at 02:01:55PM +0100, Edd Barrett wrote:
> 
> > Below an updated diff for lang/rust (with docs). Please test it, I could
> > mess myself with the revert of -doc removal.
> 
> Looks good. A couple of very small comments inline, but this is pretty
> much good to commit IMO.
> 
> > +   path/to/nowhere
> 
> What's this for?

a rustbuild specificity... targets are available as paths on rustbuild
command-line. for calling only a subset of tests (some, as gdb
testsuite, are failing to due version mismatch) it is required to pass
the paths defined in rustbuild.

"path/to/nowhere" is a generic path registered for several targets not
intented to be called from command-line. but in this list is the unitary
testsuite of all crates used by rustc which is useful to have.

-- 
Sebastien Marie

Re: update: lang/rust to 1.16.0

[Edd Barrett]

Hi,

On Sat, Mar 25, 2017 at 04:50:02PM +0100, Sebastien Marie wrote:
> For now, the following trick seems to work: I added a link at configure
> stage in bootstrap directory to ${WRKDIR}/stage2/rustdoc. The link is
> dangled at beginning. But as docs are built after binaries, a working
> rustdoc is here when docs are processed.
> 
> It is a fragile method, but it works for now. I dunno for future
> Rust releases.

Thanks. This works for me. And I'm glad we can keep the docs after all.

If in later releases this hack stops working, well, we can cross that
bridge if we come to it.

> Below an updated diff for lang/rust (with docs). Please test it, I could
> mess myself with the revert of -doc removal.

Looks good. A couple of very small comments inline, but this is pretty
much good to commit IMO.

> + path/to/nowhere

What's this for?

> +# (rustdoc isn't included in us bootstrap)

"in *our* bootstrap"

Again, thanks for your work on Rust/OpenBSD!

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: update: lang/rust to 1.16.0

[Sebastien Marie]

Hi,

Here a new diff for lang/rust with -doc subpackage.

The way it is done is different from edd@ proposal. Below the
explanation.

On Tue, Mar 21, 2017 at 09:12:51PM +, Edd Barrett wrote:
> 
> The diff I had been preparing today simply added back rustdoc into the
> bootstrap. rustdoc is (uncompressed) an 8KB binary, so I figured it's
> not really a burden upon us to have it in the bootstrap.
 
Having rustdoc in the bootstrap is just not acceptable for me. The
problem isn't related to the size, but it means the bootstrap is the
same thing than the built package.

At beginning, only one binary was enough in the bootstrap: rustc
(statically built with various librust*) + system libraries (libc, libm,
libpthread and libestdc++). The stage0 was used to build core Rust
librairies, and next build a stage1, and next build a stage2 binary.

The bootstrap tarball was a bootstrap tarball: only used for break a
dependance cycle (because rustc needs rustc to build).

Now and since few Rust releases, the requirements for building rustc are
lot more important: you need rustc (but now built with dynamic librust*)
+ all libs of stage0 (rustbuild doesn't have built mecanism for stage0)
+ cargo + system libs.

Packaging all of them in a tarball for building rustc starts really to
be no sence : it will soon be more efficient to distribute the
"bootstrap" instead of building a port with it.

The reason is Rust distribution model is based on distribution of
binaries (using a Rust tool named "rustup"). It is a real problem for
distribution like us, because we normally don't work like that.


I understand the need for some people to have a rust-doc package. The
fact to drop the rust-doc generation is a ease, due to a new dependency
to have in the bootstrap: the rustdoc binary.

I spent some time in rustbuild to found a workaround. The purpose was to
avoid to patch rustbuild: it is currently a moving target, so local
patches could be problematic to maintain.

For now, the following trick seems to work: I added a link at configure
stage in bootstrap directory to ${WRKDIR}/stage2/rustdoc. The link is
dangled at beginning. But as docs are built after binaries, a working
rustdoc is here when docs are processed.

It is a fragile method, but it works for now. I dunno for future
Rust releases.

Below an updated diff for lang/rust (with docs). Please test it, I could
mess myself with the revert of -doc removal.

rust-doc gains i386 fragment: compiler_builtins is different from amd64
(large integer support for 32-bits targets).

Thanks.
-- 
Sebastien Marie

Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile18 Feb 2017 13:15:48 -  1.38
+++ Makefile25 Mar 2017 15:38:18 -
@@ -6,13 +6,12 @@ ONLY_FOR_ARCHS =  amd64 i386
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.15.1
+V =1.16.0
 DISTNAME = rustc-${V}-src
-REVISION = 0
 
 # rustc bootstrap version
-RBV-amd64 =1.15.0-20170203
-RBV-i386 = 1.15.0-20170204
+RBV-amd64 =1.16.0-20160315
+RBV-i386 = 1.16.0-20170312
 RBV =  ${RBV-${MACHINE_ARCH}}
 
 # cargo bootstrap version
@@ -98,6 +97,21 @@ USE_LIBTOOL =gnu
 TEST_DEPENDS +=${FULLPKGNAME-main}:${BUILD_PKGPATH} \
devel/git
 
+TEST_TARGET ?= src/test/run-pass \
+   src/test/compile-fail \
+   src/test/parse-fail \
+   src/test/run-fail \
+   src/test/mir-opt \
+   src/test/incremental \
+   src/test/ui \
+   src/test/compile-fail-fulldeps \
+   src/test/run-make \
+   src/test/rustdoc \
+   src/test/pretty \
+   src/test/run-pass/pretty \
+   src/test/run-fail/pretty \
+   path/to/nowhere
+
 # - check datasize limit before configuring (and building)
 pre-configure:
@if [ `ulimit -d` -lt 1572864 ]; then \
@@ -121,6 +135,9 @@ do-configure:
echo 'channel = "stable"' >>${WRKBUILD}/config.toml
echo 'codegen-tests = false' >>${WRKBUILD}/config.toml

+   echo '[dist]' >>${WRKBUILD}/config.toml
+   echo 'src-tarball = false' >>${WRKBUILD}/config.toml
+   
 .if ${PORTS_LLVM:L:Myes}
echo '[target.${TRIPLE_ARCH}]' >>${WRKBUILD}/config.toml
echo 'llvm-config = "${LOCALBASE}/bin/llvm-config"' \
@@ -136,6 +153,12 @@ do-configure:
cp ${LOCALBASE}/lib/libestdc++.so.${LIBESTDC_VERSION} \
${WRKDIR}/modgcc-libs
 
+# hack to build doc using generated stage2 instead of with stage0
+# (rustdoc isn't included in us bootstrap)
+post-configure:
+   ln -fs ${WRKBUILD}/build/${TRIPLE_ARCH}/stage2/bin/rustdoc \
+  

Re: update: lang/rust to 1.16.0

[Edd Barrett]

Hi,

On Tue, Mar 21, 2017 at 06:22:05PM +0100, Landry Breuil wrote:
> From what i understand, it's more work to keep rustdoc in the bootstrap
> so that we can generate the docs at package build time.

Well, time to cut my losses.

The diff I had been preparing today simply added back rustdoc into the
bootstrap. rustdoc is (uncompressed) an 8KB binary, so I figured it's
not really a burden upon us to have it in the bootstrap.

As Landry says, it's ultimately up to the maintainer and I don't feel
strongly enough to argue further.

FWIW, the diff follows. A new amd64 bootstrap is here:
http://theunixzoo.co.uk/random/rustc-bootstrap-amd64-1.16.0-20170321.tar.gz

The diff also kills some trailing whitespace.

Seeya!

Index: Makefile
===
RCS file: /home/edd/cvsync/ports/lang/rust/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile18 Feb 2017 13:15:48 -  1.38
+++ Makefile21 Mar 2017 16:13:04 -
@@ -3,16 +3,15 @@
 # snapshots are only available for amd64 and i386, for now
 ONLY_FOR_ARCHS =   amd64 i386
 
-COMMENT-main = compiler for Rust Language
-COMMENT-doc =  html documentation for rustc
+COMMENT-main = compiler for Rust Language
+COMMENT-doc =  html documentation for rustc
 
-V =1.15.1
+V =1.16.0
 DISTNAME = rustc-${V}-src
-REVISION = 0
 
 # rustc bootstrap version
-RBV-amd64 =1.15.0-20170203
-RBV-i386 = 1.15.0-20170204
+RBV-amd64 =1.16.0-20170321
+RBV-i386 = 1.16.0-20170312
 RBV =  ${RBV-${MACHINE_ARCH}}
 
 # cargo bootstrap version
@@ -95,9 +94,24 @@ USE_GMAKE =  Yes
 # need for libbacktrace
 USE_LIBTOOL =  gnu
 
-TEST_DEPENDS +=${FULLPKGNAME-main}:${BUILD_PKGPATH} \
+TEST_DEPENDS +=${FULLPKGNAME}:${BUILD_PKGPATH} \
devel/git
 
+TEST_TARGET ?= src/test/run-pass \
+   src/test/compile-fail \
+   src/test/parse-fail \
+   src/test/run-fail \
+   src/test/mir-opt \
+   src/test/incremental \
+   src/test/ui \
+   src/test/compile-fail-fulldeps \
+   src/test/run-make \
+   src/test/rustdoc \
+   src/test/pretty \
+   src/test/run-pass/pretty \
+   src/test/run-fail/pretty \
+   path/to/nowhere
+
 # - check datasize limit before configuring (and building)
 pre-configure:
@if [ `ulimit -d` -lt 1572864 ]; then \
@@ -116,11 +130,14 @@ do-configure:
>>${WRKBUILD}/config.toml
echo 'prefix = "${LOCALBASE}"' >>${WRKBUILD}/config.toml
echo 'vendor = true' >>${WRKBUILD}/config.toml
-   
+
echo '[rust]' >>${WRKBUILD}/config.toml
echo 'channel = "stable"' >>${WRKBUILD}/config.toml
echo 'codegen-tests = false' >>${WRKBUILD}/config.toml
-   
+
+   echo '[dist]' >>${WRKBUILD}/config.toml
+   echo 'src-tarball = false' >>${WRKBUILD}/config.toml
+
 .if ${PORTS_LLVM:L:Myes}
echo '[target.${TRIPLE_ARCH}]' >>${WRKBUILD}/config.toml
echo 'llvm-config = "${LOCALBASE}/bin/llvm-config"' \
@@ -130,7 +147,7 @@ do-configure:
echo 'static-libstdcpp = false' >>${WRKBUILD}/config.toml
echo 'ninja = true' >>${WRKBUILD}/config.toml
 .endif
-   
+
rm -rf ${WRKDIR}/modgcc-libs
mkdir -p ${WRKDIR}/modgcc-libs
cp ${LOCALBASE}/lib/libestdc++.so.${LIBESTDC_VERSION} \
@@ -142,10 +159,9 @@ BUILD_BIN = cd ${WRKBUILD} && exec ${SET
 do-build:
${BUILD_BIN} dist --verbose --jobs=${MAKE_JOBS}
 
-COMPONENTS ?=  rustc rust-std rust-docs
 do-install:
rm -rf ${WRKBUILD}/_extractdist
-.for _c in ${COMPONENTS}
+.for _c in rustc rust-std rust-docs
mkdir ${WRKBUILD}/_extractdist
cd ${WRKBUILD}/_extractdist && tar zxf \
${WRKBUILD}/build/dist/${_c}-${V}-${TRIPLE_ARCH}.tar.gz
@@ -169,7 +185,7 @@ post-install:
${PREFIX}/lib/rustlib/manifest-*
 
 do-test:
-   ${BUILD_BIN} test --verbose --jobs=${MAKE_JOBS}
+   ${BUILD_BIN} test --verbose --jobs=${MAKE_JOBS} ${TEST_TARGET}
 
 # bootstrap target permits to regenerate the bootstrap archive
 BOOTSTRAPDIR=${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${V}-new
@@ -179,10 +195,9 @@ bootstrap: build
${MAKE} clean=fake
${MAKE} fake \
PREFIX="${BOOTSTRAPDIR}" \
-   COMPONENTS="rustc rust-std" \
FAKE_SETUP=""
rm -rf ${BOOTSTRAPDIR}/{man,share} \
-   ${BOOTSTRAPDIR}/bin/{rust-gdb,rustdoc}
+   ${BOOTSTRAPDIR}/bin/rust-gdb
mv ${BOOTSTRAPDIR}/bin/rustc{,.bin}
strip ${BOOTSTRAPDIR}/bin/rustc.bin \
${BOOTSTRAPDIR}/lib/lib*.so \
Index: distinfo
===
RCS 

Re: update: lang/rust to 1.16.0

[Landry Breuil]

On Tue, Mar 21, 2017 at 08:28:53AM +0100, Sebastien Marie wrote:
> On Mon, Mar 20, 2017 at 10:11:29PM +, Edd Barrett wrote:
> > On Mon, Mar 20, 2017 at 02:43:58PM +0100, Sebastien Marie wrote:
> > > On Sun, Mar 19, 2017 at 03:55:26PM +, Edd Barrett wrote:
> > > > 
> > > > How about a separate port for docs that depends on lang/rust? Would that
> > > > be more palatable?
> > > 
> > > I assume it could be possible, but I am unsure if rustbuild will be able 
> > > to
> > > generate only the documentation (and not just binary + doc). Testing is
> > > required :)
> > 
> > I've been prodding around. There's a 'doc' target in the top-level
> > Makefile.in, but we don't have a Makefile, presumably because we didn't
> > use the configure script.
> > 
> > If I run the configure script, then run `make doc` then it will try to
> > build again (including failing to get a bootstrap binary from rustup). I
> > think we'd need to use the configure script from the start, and I
> > appreciate there is probably a good reason not to do that.
> 
> configure script and Makefile are the legacy way to build rustc. There
> are only keep for compatibility reason. The Makefile is done in a way to
> call rustbuild.
> 
> The lang/rust port uses rustbuild directly (it is more flexible for the
> build options). The configuration is done by generating a config.toml
> (see 'configure' target in the port). And call rustbuild directly for
> the build (see 'do-build' target in the port).
> 
> > But wait, earlier you said:
> > 
> > > the main problem with shipping doc subpackages is now it requires
> > > rustdoc binary to be present in the bootstrap archive too.
> > 
> > Are you sure? We are already removing the rustdoc binary from the
> > bootstrap tarball in the in-tree 0.15.x version, so how does the in-tree
> > version make docs? It must be using it's own rustdoc?
> > 
> 
> The bootstrap is generated in the same way that the port itself (and if
> you read 'bootstrap' target in the port, you will see it reused the fake
> framework but in different directory). So all files are installed in the
> bootstrap directory, and it removes all unneeded files. Since the
> beginning, rustdoc is removed from the required files to be present in
> bootstrap.
> 
> In 1.15.1, the rustbuild used the generated rustdoc binary for compiling
> docs. It isn't the case anymore and it is why it is a problem.

>From what i understand, it's more work to keep rustdoc in the bootstrap
so that we can generate the docs at package build time, so to make
things simpler sebastien wants to drop the -docs subpackage, which i
fully agree with (less work for the maintainer). I havent tested the
diff yet but the direction in which this is going makes sense to me.
We're in 2017, docs are available online - and if they're really needed,
maybe provide a separate port for them, without all the bootstrapping
stuff that makes the rust port already quite complicated.

Landry

Re: update: lang/rust to 1.16.0

[Sebastien Marie]

On Mon, Mar 20, 2017 at 10:11:29PM +, Edd Barrett wrote:
> On Mon, Mar 20, 2017 at 02:43:58PM +0100, Sebastien Marie wrote:
> > On Sun, Mar 19, 2017 at 03:55:26PM +, Edd Barrett wrote:
> > > 
> > > How about a separate port for docs that depends on lang/rust? Would that
> > > be more palatable?
> > 
> > I assume it could be possible, but I am unsure if rustbuild will be able to
> > generate only the documentation (and not just binary + doc). Testing is
> > required :)
> 
> I've been prodding around. There's a 'doc' target in the top-level
> Makefile.in, but we don't have a Makefile, presumably because we didn't
> use the configure script.
> 
> If I run the configure script, then run `make doc` then it will try to
> build again (including failing to get a bootstrap binary from rustup). I
> think we'd need to use the configure script from the start, and I
> appreciate there is probably a good reason not to do that.

configure script and Makefile are the legacy way to build rustc. There
are only keep for compatibility reason. The Makefile is done in a way to
call rustbuild.

The lang/rust port uses rustbuild directly (it is more flexible for the
build options). The configuration is done by generating a config.toml
(see 'configure' target in the port). And call rustbuild directly for
the build (see 'do-build' target in the port).

> But wait, earlier you said:
> 
> > the main problem with shipping doc subpackages is now it requires
> > rustdoc binary to be present in the bootstrap archive too.
> 
> Are you sure? We are already removing the rustdoc binary from the
> bootstrap tarball in the in-tree 0.15.x version, so how does the in-tree
> version make docs? It must be using it's own rustdoc?
> 

The bootstrap is generated in the same way that the port itself (and if
you read 'bootstrap' target in the port, you will see it reused the fake
framework but in different directory). So all files are installed in the
bootstrap directory, and it removes all unneeded files. Since the
beginning, rustdoc is removed from the required files to be present in
bootstrap.

In 1.15.1, the rustbuild used the generated rustdoc binary for compiling
docs. It isn't the case anymore and it is why it is a problem.


But now it is enough. Please show your code or shut up.
-- 
Sebastien Marie

Re: update: lang/rust to 1.16.0

[Edd Barrett]

Hi Sebastien,

Sorry this is dragging on a bit.

On Mon, Mar 20, 2017 at 02:43:58PM +0100, Sebastien Marie wrote:
> On Sun, Mar 19, 2017 at 03:55:26PM +, Edd Barrett wrote:
> > 
> > How about a separate port for docs that depends on lang/rust? Would that
> > be more palatable?
> 
> I assume it could be possible, but I am unsure if rustbuild will be able to
> generate only the documentation (and not just binary + doc). Testing is
> required :)

I've been prodding around. There's a 'doc' target in the top-level
Makefile.in, but we don't have a Makefile, presumably because we didn't
use the configure script.

If I run the configure script, then run `make doc` then it will try to
build again (including failing to get a bootstrap binary from rustup). I
think we'd need to use the configure script from the start, and I
appreciate there is probably a good reason not to do that.

But wait, earlier you said:

> the main problem with shipping doc subpackages is now it requires
> rustdoc binary to be present in the bootstrap archive too.

Are you sure? We are already removing the rustdoc binary from the
bootstrap tarball in the in-tree 0.15.x version, so how does the in-tree
version make docs? It must be using it's own rustdoc?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: update: lang/rust to 1.16.0

[Sebastien Marie]

On Sun, Mar 19, 2017 at 03:55:26PM +, Edd Barrett wrote:
> On Sun, Mar 19, 2017 at 04:40:27PM +0100, Sebastien Marie wrote:
> > so the bootstrap archive will look like really a full package.
> 
> How about a separate port for docs that depends on lang/rust? Would that
> be more palatable?
> 

I assume it could be possible, but I am unsure if rustbuild will be able to
generate only the documentation (and not just binary + doc). Testing is
required :)

I don't have time to work on that. But I should able to review a port
(and modifications on lang/rust to share some variables).

For now, I already shared a link to download the documentation, and as
we are in -beta, I would like to see rust-1.16.0 to be commited in order
to have it in 6.1.
-- 
Sebastien Marie

Re: update: lang/rust to 1.16.0

[Edd Barrett]

On Sun, Mar 19, 2017 at 04:40:27PM +0100, Sebastien Marie wrote:
> so the bootstrap archive will look like really a full package.

How about a separate port for docs that depends on lang/rust? Would that
be more palatable?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: update: lang/rust to 1.16.0

[Edd Barrett]

On Sun, Mar 19, 2017 at 03:03:11PM +, Edd Barrett wrote:
> As always, thanks for your hard work on Rust/OpenBSD.
> 
> Looks good to me. A couple of comments inline.

Ah also, there's some trailing whitespace in the Makefile. We could kill
this with a separate commit.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: update: lang/rust to 1.16.0

[Edd Barrett]

Hi Sebastien,

On Thu, Mar 16, 2017 at 03:34:52PM +0100, Sebastien Marie wrote:
> The following diff updates lang/rust to 1.16.0.

As always, thanks for your hard work on Rust/OpenBSD.

Looks good to me. A couple of comments inline.

> It merges -main and -doc, and doesn't provide documentation anymore.

I was meant to pipe up in the other thread, but I think the docs
sub-package is actually a nice addition, as it means I always have the
right docs for the version I have installed. I think I'd forget to
download the docs again when a new version comes out.

(and like Laurie, I use trains quite a lot)

> The diff includes REVISION bump for devel/cargo and textproc/ripgrep.

Not an immediate problem, but what are you going to do when we have 300
rust apps in-tree? We can't manually bump every time, can we?

> ++/// ```no_run
> + /// use std::os::unix::net::UnixDatagram;
> + /// use std::time::Duration;

Should you raise a bug upstream for these tests?

I managed to build ripgrep and cargo fine with this update (amd64).

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

update: lang/rust 1.15.1

[Sebastien Marie]

Hi,

As landry@ needs some update for lang/rust (it is a dependency of
firefox trunk), I post now my current state of the port.

First, it is functional (even if a bit slow compared to 1.14.0), and is
commitable. I ask for review and commit.

My current working area is the build time due to the switch to embedded
llvm version (build time switchs from 2h to 9h, and just the build time
for compiling llvm doesn't explain the difference). The in-tree version
suffers the same problem.

About the update from 1.14.0 to 1.15.1, the port changes a lot.

(1) Rust devs have deprecated the current configure + make way to build
(Makefile are deleted in trunk, the forecoming 1.17.0 version) to switch
to rustbuild system: a custom orchestor for building rustc. And as
reinventing the wheel isn't enough, the tool is written in Rust language
and requires Cargo to build.

It makes the lang/rust port to requires a *two* binaries bootstrap (one
for rustc and another for cargo). I reused the cargo bootstrap used for
devel/cargo for this purpose.

So, configure + build + install + test target are customs:
  - for configure, I generated a config.toml file reflecting build
configuration

  - for build, I just call the python stuff that build the builder and
launch it for generating dist (tgz ready to install)
  
  - for install, I used the generated tgz to install in PREFIX. I added
some cleanup, and I replaced duplicated libraries by symlink.


(2) The documentation doesn't include anymore rust-libc documentation.
It makes the port to no need anymore b32/b64 PFRAG.


(3) The libraries produced by rustc don't have any more a name based on
rustc version (the RUST_HASH variable in the port)... it is based on own
rust cooking. So each lib has its own hash. And to help the maintainer
it is arch dependant... So I added per arch PFRAG for libraries. The
PLIST will changes for each release.


(4) About LLVM, I tried to minimize the diff between devel/llvm-3.9.1
and embedded version. Some patches on src/llvm are requires, others no
strictly, and are part of my work to understand the difference of build
time. All were present in devel/llvm-3.9.1 tree. Same thing for build
configuration (src/bootstrap/native.rs).


Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile6 Jan 2017 17:32:22 -   1.35
+++ Makefile12 Feb 2017 05:49:24 -
@@ -6,15 +6,18 @@ ONLY_FOR_ARCHS =  amd64 i386
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.14.0
-BV-amd64 = 1.14.0-20161221
-BV-i386 =  1.14.0-20161221
+V =1.15.1
 DISTNAME = rustc-${V}-src
 
-#RUST_HASH !=  echo -n ${V} | md5 | cut -c1-8
-RUST_HASH =f5a209a9
-SUBST_VARS +=  RUST_HASH
-BV =   ${BV-${MACHINE_ARCH}}
+# rustc bootstrap version
+RBV-amd64 =1.15.0-20170203
+RBV-i386 = 1.15.0-20170204
+RBV =  ${RBV-${MACHINE_ARCH}}
+
+# cargo bootstrap version
+CBV-amd64 =0.15.0-20161230
+CBV-i386 = 0.15.0-20161230
+CBV =  ${CBV-${MACHINE_ARCH}}
 
 PKGNAME =  rust-${V}
 PKGNAME-main = rust-${V}
@@ -39,43 +42,40 @@ MASTER_SITES0 = http://kapouay.odns.fr/
 
 DIST_SUBDIR =  rust
 DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
-   ${BOOTSTRAP}
+   ${RBOOTSTRAP} \
+   ${CBOOTSTRAP}
 
-BOOTSTRAP =${BOOTSTRAP-${MACHINE_ARCH}}
-.for m in i386 amd64
-BOOTSTRAP-$m = rustc-bootstrap-${m}-${BV-$m}.tar.gz:0
-SUPDISTFILES +=${BOOTSTRAP-$m}
+RBOOTSTRAP =   ${RBOOTSTRAP-${MACHINE_ARCH}}
+CBOOTSTRAP =   ${CBOOTSTRAP-${MACHINE_ARCH}}
+.for m in ${ONLY_FOR_ARCHS}
+RBOOTSTRAP-$m =rustc-bootstrap-${m}-${RBV-$m}.tar.gz:0
+CBOOTSTRAP-$m =../cargo/cargo-bootstrap-${m}-${CBV-$m}.tar.gz:0
+SUPDISTFILES +=${RBOOTSTRAP-$m} \
+   ${CBOOTSTRAP-$m}
 .endfor
 
-WRKDIST =  ${WRKDIR}/${DISTNAME:S/-src//}
-
-# MACHINE_ARCH to TRIPLE_ARCH conversion
+# per MACHINE_ARCH configuration
 .if "${MACHINE_ARCH}" == "amd64"
 TRIPLE_ARCH =  x86_64-unknown-openbsd
+PKG_ARGS +=-Damd64=1 -Di386=0
 .elif "${MACHINE_ARCH}" == "i386"
 TRIPLE_ARCH =  i686-unknown-openbsd
-.endif
-SUBST_VARS +=  TRIPLE_ARCH
-
-# PFRAG
-.if ${MACHINE_ARCH} == amd64
-PKG_ARGS += -Db64=1
-.else
-PKG_ARGS += -Db64=0
-.endif
-
-.if ${MACHINE_ARCH} == i386
-PKG_ARGS += -Db32=1
-.else
-PKG_ARGS += -Db32=0
+PKG_ARGS +=-Damd64=0 -Di386=1
 .endif
 
 MODULES += gcc4 \
lang/python
-BUILD_DEPENDS +=   devel/cmake \
- 

Re: update: lang/rust 1.14.0

[Sebastien Marie]

On Mon, Dec 26, 2016 at 10:06:56AM +0100, Landry Breuil wrote:
> On Fri, Dec 23, 2016 at 08:56:32AM +0100, Sebastien Marie wrote:
> > Hi,
> > 
> > Here an update to lang/rust to the upcoming 1.14.0 version (should be
> > released today).
> 
> Dunno if that was a final tarball or not but i had to regen distinfo.
> 
> -SHA256 (rust/rustc-1.14.0-src.tar.gz) = 
> R6Ts0bG6NmaWwTNk2iE+pqiJ4cOzJrdvMuTR3wl0nq4=
> +SHA256 (rust/rustc-1.14.0-src.tar.gz) = 
> x5Dt0ukVvQG+pGEirylCEIR5ov2ppvdtEJSt1SCsO2s=
> 
> -SIZE (rust/rustc-1.14.0-src.tar.gz) = 27576042
> +SIZE (rust/rustc-1.14.0-src.tar.gz) = 27572650
> 
> Landry
> 

I mostly reply for ports@ (because already discussed about that with
landry@).

I checked back my previous archive against the new one: diff didn't
found changes in file's content. The size changes is related to gzip
layer (plain tar has same size).

So updating distinfo is what to do.
-- 
Sebastien Marie

Re: update: lang/rust 1.14.0

[Landry Breuil]

On Fri, Dec 23, 2016 at 08:56:32AM +0100, Sebastien Marie wrote:
> Hi,
> 
> Here an update to lang/rust to the upcoming 1.14.0 version (should be
> released today).

Dunno if that was a final tarball or not but i had to regen distinfo.

-SHA256 (rust/rustc-1.14.0-src.tar.gz) = 
R6Ts0bG6NmaWwTNk2iE+pqiJ4cOzJrdvMuTR3wl0nq4=
+SHA256 (rust/rustc-1.14.0-src.tar.gz) = 
x5Dt0ukVvQG+pGEirylCEIR5ov2ppvdtEJSt1SCsO2s=

-SIZE (rust/rustc-1.14.0-src.tar.gz) = 27576042
+SIZE (rust/rustc-1.14.0-src.tar.gz) = 27572650

Landry

update: lang/rust 1.14.0

[Sebastien Marie]

Hi,

Here an update to lang/rust to the upcoming 1.14.0 version (should be
released today).

All testsuites passed for amd64 and i386 (just run-pass/out-of-stack
that still fail occasionally). amd64 was testing with llvm-3.9.1 and
llvm-3.9.0p2, whereas i386 just with llvm-3.9.0p2 (bad timing with llvm
update).

Cargo building was also tested (requires BUILD_DEPENDS version change).

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile6 Dec 2016 22:39:49 -   1.33
+++ Makefile22 Dec 2016 13:45:52 -
@@ -6,14 +6,13 @@ ONLY_FOR_ARCHS =  amd64 i386
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.13.0
-BV-amd64 = 1.13.0-2016
-BV-i386 =  1.13.0-20161204
+V =1.14.0
+BV-amd64 = 1.14.0-20161221
+BV-i386 =  1.14.0-20161221
 DISTNAME = rustc-${V}-src
-REVISION = 0
 
 #RUST_HASH !=  echo -n ${V} | md5 | cut -c1-8
-RUST_HASH =a4729905
+RUST_HASH =f5a209a9
 SUBST_VARS +=  RUST_HASH
 BV =   ${BV-${MACHINE_ARCH}}
 
@@ -157,6 +156,7 @@ bootstrap: configure
mkdir -p ${BOOTSTRAPDIR}/{bin,lib}
cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ${GMAKE} rustc-stage3
cp ${WRKBUILD}/${TRIPLE_ARCH}/stage3/bin/rustc ${BOOTSTRAPDIR}/bin
+   strip ${BOOTSTRAPDIR}/bin/rustc
ldd ${BOOTSTRAPDIR}/bin/rustc \
| sed -ne 's,.* \(/.*/lib/lib.*\.so.[.0-9]*\)$$,\1,p' \
| xargs -r -J % cp % \
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo6 Dec 2016 22:39:49 -   1.20
+++ distinfo22 Dec 2016 13:45:52 -
@@ -1,6 +1,6 @@
-SHA256 (rust/rustc-1.13.0-src.tar.gz) = 
7LhHdcqXel7+wU0MrRliGhVb/Lv0boBQ0Ychux4+UIQ=
-SHA256 (rust/rustc-bootstrap-amd64-1.13.0-2016.tar.gz) = 
aRdlJOgRf7aK7OjJgwH3qsv2ALFvqxlXoaGodttNAXM=
-SHA256 (rust/rustc-bootstrap-i386-1.13.0-20161204.tar.gz) = 
iarIZ/ar4PqF033jFNGm+i0OoDBtnaAc0rWLC/kUBOY=
-SIZE (rust/rustc-1.13.0-src.tar.gz) = 27483805
-SIZE (rust/rustc-bootstrap-amd64-1.13.0-2016.tar.gz) = 24698844
-SIZE (rust/rustc-bootstrap-i386-1.13.0-20161204.tar.gz) = 26293310
+SHA256 (rust/rustc-1.14.0-src.tar.gz) = 
R6Ts0bG6NmaWwTNk2iE+pqiJ4cOzJrdvMuTR3wl0nq4=
+SHA256 (rust/rustc-bootstrap-amd64-1.14.0-20161221.tar.gz) = 
oxPRGSqKA+Pyt9p7itQlDkAf0DmvFBnRha2l7cRkTy8=
+SHA256 (rust/rustc-bootstrap-i386-1.14.0-20161221.tar.gz) = 
+DK+UWnh+ywjLZLXDJ3c3lXNt3lRCvUfDRXrKAydOOE=
+SIZE (rust/rustc-1.14.0-src.tar.gz) = 27576042
+SIZE (rust/rustc-bootstrap-amd64-1.14.0-20161221.tar.gz) = 21862142
+SIZE (rust/rustc-bootstrap-i386-1.14.0-20161221.tar.gz) = 23054891
Index: patches/patch-configure
===
RCS file: /cvs/ports/lang/rust/patches/patch-configure,v
retrieving revision 1.14
diff -u -p -r1.14 patch-configure
--- patches/patch-configure 12 Nov 2016 16:42:24 -  1.14
+++ patches/patch-configure 22 Dec 2016 13:45:52 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-configure,v 1.14 2016/11/12 16:42:24 danj Exp $
 Remove requirement for curl.
 The snapshot isn't downloaded but copied by post-configure.
 configure.orig Tue Nov  8 04:16:18 2016
-+++ configure  Fri Nov 11 11:09:36 2016
-@@ -752,7 +752,7 @@ if [ -n "$CFG_ENABLE_DEBUG_JEMALLOC" ]; then putvar CF
+--- configure.orig Sun Dec 18 00:40:11 2016
 configure  Wed Dec 21 11:18:23 2016
+@@ -783,7 +783,7 @@ if [ -n "$CFG_ENABLE_DEBUG_JEMALLOC" ]; then putvar CF
  
  step_msg "looking for build programs"
  
Index: patches/patch-src_librustc_back_target_i686_unknown_openbsd_rs
===
RCS file: 
/cvs/ports/lang/rust/patches/patch-src_librustc_back_target_i686_unknown_openbsd_rs,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_librustc_back_target_i686_unknown_openbsd_rs
--- patches/patch-src_librustc_back_target_i686_unknown_openbsd_rs  6 Dec 
2016 22:39:49 -   1.1
+++ patches/patch-src_librustc_back_target_i686_unknown_openbsd_rs  22 Dec 
2016 13:45:52 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-src_librustc_back_target_i686_unknown_openbsd_rs,v 1.1 
2016/12/06 22:39:49 juanfra Exp $
 Add i686-unknown-openbsd target.
-https://github.com/rust-lang/rust/pull/38086 (backported)
 src/librustc_back/target/i686_unknown_openbsd.rs.orig  Tue Nov 29 
13:58:28 2016
-+++ src/librustc_back/target/i686_unknown_openbsd.rs   Tue Nov 29 13:58:28 2016
+https://github.com/rust-lang/rust/pull/38086
+--- src/librustc_back/target/i686_unknown_openbsd.rs.orig  Wed Dec 21 
11:23:51 2016
 

Re: [update] lang/rust 1.13.0

[Daniel Jakots]

On Sat, 12 Nov 2016 10:00:45 +0100, Sebastien Marie 
wrote:

> Here an update for lang/rust to 1.13.0

It's ok danj@ (I'm not really quick, I got premium access to the
diff ;)).

Cheers,
Daniel

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

Re: update lang/rust

[Daniel Jakots]

On Fri, 30 Sep 2016 10:20:50 +0200, Sebastien Marie 
wrote:

> Here an update for lang/rust to 1.12.0

make fake and make test are fine

for make package, in semarie's diff there is
+share/doc/rust/html/error-index.md
which is not present. I removed this line and it packages fine.
I attach the new diff which is the same as semarie's but without the
error-index.md line in PLIST-doc.

ok danj@ fwiw

Cheers,
Daniel
Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile	3 Sep 2016 19:51:47 -	1.29
+++ Makefile	2 Oct 2016 09:26:05 -
@@ -7,13 +7,12 @@ PKG_ARCH-doc =		*
 COMMENT-main =		compiler for Rust Language
 COMMENT-doc =		html documentation for rustc
 
-V =			1.11.0
-BV =			1.11.0-20160819
+V =			1.12.0
+BV =			1.12.0-20160929
 DISTNAME =		rustc-${V}-src
-REVISION =		1
 
 #RUST_HASH !=		echo -n ${V} | md5 | cut -c1-8
-RUST_HASH =		39b92f95
+RUST_HASH =		40393716
 SUBST_VARS +=		RUST_HASH
 
 PKGNAME =		rust-${V}
@@ -83,14 +82,14 @@ CONFIGURE_STYLE =	simple
 CONFIGURE_ARGS +=	--disable-valgrind-rpass \
 			--disable-codegen-tests \
 			--release-channel=stable \
+			--local-rust-root="${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${BV}" \
 			--llvm-root="${LOCALBASE}" \
 			--prefix="${LOCALBASE}" \
 			--mandir="${LOCALBASE}/man"
 
 # VERSION and BOOTSTRAP are same version
 .if ${V} == ${BV:C/-[0-9]+$//}
-CONFIGURE_ARGS +=	--enable-local-rebuild \
-			--local-rust-root="${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${BV}"
+CONFIGURE_ARGS +=	--enable-local-rebuild
 .endif
 
 CONFIGURE_ENV +=	ac_cv_header_execinfo_h=no
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo	31 Aug 2016 08:33:19 -	1.16
+++ distinfo	2 Oct 2016 09:26:05 -
@@ -1,4 +1,4 @@
-SHA256 (rust/rustc-1.11.0-src.tar.gz) = NoUDSnjnBje9+jEXYZ91nySBAC/Zq7x4zA9zfJl03mo=
-SHA256 (rust/rustc-bootstrap-amd64-1.11.0-20160819.tar.gz) = 9Lrq/8nTe68NSyhhNd5fX+7f3g5CYF5JihpCvPt8vKM=
-SIZE (rust/rustc-1.11.0-src.tar.gz) = 26126471
-SIZE (rust/rustc-bootstrap-amd64-1.11.0-20160819.tar.gz) = 24942907
+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
Index: patches/patch-mk_rt_mk
===
RCS file: patches/patch-mk_rt_mk
diff -N patches/patch-mk_rt_mk
--- patches/patch-mk_rt_mk	31 Aug 2016 08:33:19 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-mk_rt_mk,v 1.1 2016/08/31 08:33:19 landry Exp $
-specify compile-rt directory for OpenBSD
 mk/rt.mk.orig	Fri Aug 19 13:19:27 2016
-+++ mk/rt.mk	Fri Aug 19 13:20:07 2016
-@@ -274,6 +274,10 @@ ifndef COMPRT_DIR_$(1)
- COMPRT_DIR_$(1) := linux
- COMPRT_ARCH_$(1) := $$(patsubst i586,i386,$$(COMPRT_ARCH_$(1)))
- 
-+ifeq ($$(findstring openbsd,$(1)),openbsd)
-+COMPRT_DIR_$(1) := openbsd
-+endif
-+
- ifeq ($$(findstring android,$(1)),android)
- ifeq ($$(findstring arm,$$(COMPRT_ARCH_$(1))),arm)
- COMPRT_ARCH_$(1) := armhf
Index: pkg/PLIST-doc
===
RCS file: /cvs/ports/lang/rust/pkg/PLIST-doc,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-doc
--- pkg/PLIST-doc	31 Aug 2016 08:33:19 -	1.13
+++ pkg/PLIST-doc	2 Oct 2016 09:26:06 -
@@ -212,15 +212,6 @@ share/doc/rust/html/collections/fmt/
 share/doc/rust/html/collections/fmt/fn.format.html
 share/doc/rust/html/collections/fmt/fn.write.html
 share/doc/rust/html/collections/fmt/index.html
-share/doc/rust/html/collections/fmt/rt/
-share/doc/rust/html/collections/fmt/rt/index.html
-share/doc/rust/html/collections/fmt/rt/v1/
-share/doc/rust/html/collections/fmt/rt/v1/enum.Alignment.html
-share/doc/rust/html/collections/fmt/rt/v1/enum.Count.html
-share/doc/rust/html/collections/fmt/rt/v1/enum.Position.html
-share/doc/rust/html/collections/fmt/rt/v1/index.html
-share/doc/rust/html/collections/fmt/rt/v1/struct.Argument.html
-share/doc/rust/html/collections/fmt/rt/v1/struct.FormatSpec.html
 share/doc/rust/html/collections/fmt/sidebar-items.js
 share/doc/rust/html/collections/fmt/struct.Arguments.html
 share/doc/rust/html/collections/fmt/struct.DebugList.html
@@ -275,51 +266,6 @@ share/doc/rust/html/collections/slice/st
 share/doc/rust/html/collections/slice/struct.SplitNMut.html
 share/doc/rust/html/collections/slice/struct.Windows.html
 share/doc/rust/html/collections/slice/trait.SliceConcatExt.html
-share/doc/rust/html/collections/std/
-share/doc/rust/html/collections/std/ops/
-share/doc/rust/html/collections/std/ops/enum.RangeInclusive.html

update lang/rust

[Sebastien Marie]

Hi,

Here an update for lang/rust to 1.12.0

Please note that this update will break devel/cargo. But I am working on
updating devel/cargo too (so just wait for cargo update before commiting
rust).

Thanks.
-- 
Sebastien Marie

Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile3 Sep 2016 19:51:47 -   1.29
+++ Makefile30 Sep 2016 07:42:23 -
@@ -7,13 +7,12 @@ PKG_ARCH-doc =*
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.11.0
-BV =   1.11.0-20160819
+V =1.12.0
+BV =   1.12.0-20160929
 DISTNAME = rustc-${V}-src
-REVISION = 1
 
 #RUST_HASH !=  echo -n ${V} | md5 | cut -c1-8
-RUST_HASH =39b92f95
+RUST_HASH =40393716
 SUBST_VARS +=  RUST_HASH
 
 PKGNAME =  rust-${V}
@@ -83,14 +82,14 @@ CONFIGURE_STYLE =   simple
 CONFIGURE_ARGS +=  --disable-valgrind-rpass \
--disable-codegen-tests \
--release-channel=stable \
+   
--local-rust-root="${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${BV}" \
--llvm-root="${LOCALBASE}" \
--prefix="${LOCALBASE}" \
--mandir="${LOCALBASE}/man"
 
 # VERSION and BOOTSTRAP are same version
 .if ${V} == ${BV:C/-[0-9]+$//}
-CONFIGURE_ARGS +=  --enable-local-rebuild \
-   
--local-rust-root="${WRKDIR}/rustc-bootstrap-${MACHINE_ARCH}-${BV}"
+CONFIGURE_ARGS +=  --enable-local-rebuild
 .endif
 
 CONFIGURE_ENV +=   ac_cv_header_execinfo_h=no
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo31 Aug 2016 08:33:19 -  1.16
+++ distinfo30 Sep 2016 07:42:23 -
@@ -1,4 +1,4 @@
-SHA256 (rust/rustc-1.11.0-src.tar.gz) = 
NoUDSnjnBje9+jEXYZ91nySBAC/Zq7x4zA9zfJl03mo=
-SHA256 (rust/rustc-bootstrap-amd64-1.11.0-20160819.tar.gz) = 
9Lrq/8nTe68NSyhhNd5fX+7f3g5CYF5JihpCvPt8vKM=
-SIZE (rust/rustc-1.11.0-src.tar.gz) = 26126471
-SIZE (rust/rustc-bootstrap-amd64-1.11.0-20160819.tar.gz) = 24942907
+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
Index: patches/patch-mk_rt_mk
===
RCS file: patches/patch-mk_rt_mk
diff -N patches/patch-mk_rt_mk
--- patches/patch-mk_rt_mk  31 Aug 2016 08:33:19 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-mk_rt_mk,v 1.1 2016/08/31 08:33:19 landry Exp $
-specify compile-rt directory for OpenBSD
 mk/rt.mk.orig  Fri Aug 19 13:19:27 2016
-+++ mk/rt.mk   Fri Aug 19 13:20:07 2016
-@@ -274,6 +274,10 @@ ifndef COMPRT_DIR_$(1)
- COMPRT_DIR_$(1) := linux
- COMPRT_ARCH_$(1) := $$(patsubst i586,i386,$$(COMPRT_ARCH_$(1)))
- 
-+ifeq ($$(findstring openbsd,$(1)),openbsd)
-+COMPRT_DIR_$(1) := openbsd
-+endif
-+
- ifeq ($$(findstring android,$(1)),android)
- ifeq ($$(findstring arm,$$(COMPRT_ARCH_$(1))),arm)
- COMPRT_ARCH_$(1) := armhf
Index: pkg/PLIST-doc
===
RCS file: /cvs/ports/lang/rust/pkg/PLIST-doc,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-doc
--- pkg/PLIST-doc   31 Aug 2016 08:33:19 -  1.13
+++ pkg/PLIST-doc   30 Sep 2016 07:42:23 -
@@ -212,15 +212,6 @@ share/doc/rust/html/collections/fmt/
 share/doc/rust/html/collections/fmt/fn.format.html
 share/doc/rust/html/collections/fmt/fn.write.html
 share/doc/rust/html/collections/fmt/index.html
-share/doc/rust/html/collections/fmt/rt/
-share/doc/rust/html/collections/fmt/rt/index.html
-share/doc/rust/html/collections/fmt/rt/v1/
-share/doc/rust/html/collections/fmt/rt/v1/enum.Alignment.html
-share/doc/rust/html/collections/fmt/rt/v1/enum.Count.html
-share/doc/rust/html/collections/fmt/rt/v1/enum.Position.html
-share/doc/rust/html/collections/fmt/rt/v1/index.html
-share/doc/rust/html/collections/fmt/rt/v1/struct.Argument.html
-share/doc/rust/html/collections/fmt/rt/v1/struct.FormatSpec.html
 share/doc/rust/html/collections/fmt/sidebar-items.js
 share/doc/rust/html/collections/fmt/struct.Arguments.html
 share/doc/rust/html/collections/fmt/struct.DebugList.html
@@ -275,51 +266,6 @@ share/doc/rust/html/collections/slice/st
 share/doc/rust/html/collections/slice/struct.SplitNMut.html
 share/doc/rust/html/collections/slice/struct.Windows.html
 

[update] lang/rust 1.9.0

[Sebastien Marie]

Hi,

Here an update for lang/rust 1.9.0

All tests passed, devel/cargo (in wip) still build and pass tests.

Diff includes:
  - changes in Makefile to make it compute itself the RUST_HASH value

  - use new configure option --disable-codegen-tests as with don't have
FileCheck (from llvm) binary. remove the patches in configure and
src/compiletest/runtest.rs

  - disable (for now) two news tests added with unix socket support,
that doesn't pass. I will investigate them later.

  - disable run-pass/backtrace test. The support of libbacktrace has
been remove recently.

Comments ? OK ?
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile25 May 2016 06:39:35 -  1.22
+++ Makefile27 May 2016 04:54:10 -
@@ -7,11 +7,10 @@ PKG_ARCH-doc =*
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.8.0
-RUST_HASH =4fda350b
+V =1.9.0
 DISTNAME = rustc-${V}-src
-REVISION = 1
 
+RUST_HASH !=   echo -n ${V} | md5 | cut -c1-8
 SUBST_VARS +=  RUST_HASH
 
 PKGNAME =  rust-${V}
@@ -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-2016-02-17-4d3eebf-openbsd-x86_64-266b485dc1658ceb1b119ea57ff5fab705003776.tar.bz2
+SNAPSHOT-amd64 =   
rust-stage0-2016-03-18-235d774-openbsd-x86_64-6d5adfe4301d158be8a5a33fb2e11bf857475cb3.tar.bz2
 
 CATEGORIES =   lang
 
@@ -84,6 +83,7 @@ USE_GMAKE =   Yes
 
 CONFIGURE_STYLE =  simple
 CONFIGURE_ARGS +=  --disable-valgrind-rpass \
+   --disable-codegen-tests \
--release-channel=stable \
--llvm-root="${LOCALBASE}" \
--prefix="${LOCALBASE}" \
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo9 May 2016 14:08:41 -   1.13
+++ distinfo27 May 2016 04:54:10 -
@@ -1,4 +1,4 @@
-SHA256 
(rust/rust-stage0-2016-02-17-4d3eebf-openbsd-x86_64-266b485dc1658ceb1b119ea57ff5fab705003776.tar.bz2)
 = OANhNg3teNKGq2uSqGSA0qU3Cud3S6ToVPGl7hQoSqA=
-SHA256 (rust/rustc-1.8.0-src.tar.gz) = 
r0RmFH6NTbTeKkbgdJTS3C2WMTxbN9o0I39RHJBfdEk=
-SIZE 
(rust/rust-stage0-2016-02-17-4d3eebf-openbsd-x86_64-266b485dc1658ceb1b119ea57ff5fab705003776.tar.bz2)
 = 21383007
-SIZE (rust/rustc-1.8.0-src.tar.gz) = 25641320
+SHA256 
(rust/rust-stage0-2016-03-18-235d774-openbsd-x86_64-6d5adfe4301d158be8a5a33fb2e11bf857475cb3.tar.bz2)
 = 8QZ/pf8S9dkMdbFw5kIU/x4VkwT51I9W1gyoFDt9tOQ=
+SHA256 (rust/rustc-1.9.0-src.tar.gz) = 
sZshGT19NgOd6+qqH2HL+YeH4M6UvYXFy+KllGLXz80=
+SIZE 
(rust/rust-stage0-2016-03-18-235d774-openbsd-x86_64-6d5adfe4301d158be8a5a33fb2e11bf857475cb3.tar.bz2)
 = 21260143
+SIZE (rust/rustc-1.9.0-src.tar.gz) = 25859714
Index: patches/patch-configure
===
RCS file: /cvs/ports/lang/rust/patches/patch-configure,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure
--- patches/patch-configure 13 Apr 2016 17:33:51 -  1.9
+++ patches/patch-configure 27 May 2016 04:54:10 -
@@ -1,11 +1,9 @@
 $OpenBSD: patch-configure,v 1.9 2016/04/13 17:33:51 semarie Exp $
 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 Mon Apr 11 23:22:03 2016
-+++ configure  Wed Apr 13 10:23:22 2016
-@@ -727,7 +727,7 @@ putvar CFG_BOOTSTRAP_KEY
+--- configure.orig Mon May 23 18:29:00 2016
 configure  Tue May 24 06:06:32 2016
+@@ -719,7 +719,7 @@ if [ -n "$CFG_ENABLE_ORBIT" ]; then putvar CFG_ENABLE_
  
  step_msg "looking for build programs"
  
@@ -14,12 +12,3 @@ Remove requirement for FileCheck (LLVM) 
  if [ -z "$CFG_PYTHON_PROVIDED" ]; then
  probe_need CFG_PYTHON  python2.7 python2 python
  fi
-@@ -1494,7 +1494,7 @@ do
- LLVM_INST_DIR=$CFG_LLVM_ROOT
- do_reconfigure=0
- # Check that LLVm FileCheck is available. Needed for the tests
--need_cmd $LLVM_INST_DIR/bin/FileCheck
-+#need_cmd $LLVM_INST_DIR/bin/FileCheck
- fi
- 
- if [ ${do_reconfigure} -ne 0 ]
Index: patches/patch-src_compiletest_runtest_rs
===
RCS file: patches/patch-src_compiletest_runtest_rs
diff -N patches/patch-src_compiletest_runtest_rs
--- patches/patch-src_compiletest_runtest_rs13 Apr 2016 17:33:51 -  
1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,39 +0,0 @@

update lang/rust to 1.8.0

[Sebastien Marie]

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
--- Makefile11 Mar 2016 05:30:45 -  1.17
+++ Makefile13 Apr 2016 14:59:59 -
@@ -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
--- distinfo5 Mar 2016 15:05:33 -   1.10
+++ distinfo13 Apr 2016 14:59:59 -
@@ -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 -  1.8
+++ patches/patch-configure 13 Apr 2016 14:59:59 -
@@ -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_rs11 Mar 2016 05:30:45 -  
1.1
+++ patches/patch-src_compiletest_runtest_rs13 Apr 2016 14:59:59 -
@@ -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.origMon 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: , props: 
- compose_and_run_compiler(config, props, testfile, args, None)
+--- src/compiletest/runtest.rs.origMon 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: , props: 
+ compose_and_run_compiler(config, props, testpaths, args, None)
  }
  
--fn check_ir_with_filecheck(config: , testfile: ) -> ProcRes {
--let irfile = output_base_name(config, testfile).with_extension("ll");
+-fn check_ir_with_filecheck(config: , testpaths: ) -> ProcRes 
{
+-let irfile = output_base_name(config, 

Re: UPDATE: lang/rust 1.7.0

[Brandon Mercer]

On Fri, Mar 04, 2016 at 08:45:56AM -0700, Aaron Bieber wrote:
> 
> Sebastien Marie writes:
> 
> > Hi,
> >
> > Today is the release date for rustc 1.7.0.
> >
> > So here an update for lang/rust.
> >
> > OK ?
> 
> Are you able to build openbsd-wip/devel/cargo/bootstrap with this? It
> fails for me.

IMO this isn't a problem with rust. Just looks like cargo needs to be
updated not to have unused imports? Is this just a behavior change in
the rust toolchain or did our port change to do something different?

Also, working for me on amd64. The diff looks reasonable. FWIW> 

Re: UPDATE: lang/rust 1.7.0

[Aaron Bieber]

Sebastien Marie writes:

> Hi,
>
> Today is the release date for rustc 1.7.0.
>
> So here an update for lang/rust.
>
> OK ?

Are you able to build openbsd-wip/devel/cargo/bootstrap with this? It
fails for me.

Re: [update] lang/rust upcoming 1.6.0

[Aaron Bieber]

Sebastien Marie writes:

> Hi,
>
> Here an update for lang/rust for the upcoming 1.6.0 (scheduled for
> stable release January 21, 2016).
>
> The backported patches for build system are updated.
>
> All tests passes.
>
> I also ensured that openbsd-wip/devel/cargo/bootstrap (which depends on
> lang/rust) still build fine.
>
> OK ? Comments ?

Seems to work fine here. Fixes some issues I had with freepass panicing!

OK abieber@

> -- 
> Sebastien Marie
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/rust/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- Makefile  13 Jan 2016 07:39:07 -  1.13
> +++ Makefile  21 Jan 2016 07:51:49 -
> @@ -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
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/rust/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  10 Dec 2015 17:53:57 -  1.8
> +++ distinfo  21 Jan 2016 07:51:49 -
> @@ -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
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/lang/rust/patches/patch-configure,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-configure
> --- patches/patch-configure   13 Jan 2016 07:39:08 -  1.5
> +++ patches/patch-configure   21 Jan 2016 07:51:49 -
> @@ -1,9 +1,9 @@
>  $OpenBSD: patch-configure,v 1.5 2016/01/13 07:39:08 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
> -+++ configureTue Dec 15 06:46:14 2015
> -@@ -721,7 +721,7 @@ putvar CFG_BOOTSTRAP_KEY
> +--- configure.orig   Wed Jan 20 04:37:51 2016
>  configureWed Jan 20 19:36:15 2016
> +@@ -717,7 +717,7 @@ putvar CFG_BOOTSTRAP_KEY
>   
>   step_msg "looking for build programs"
>   
> Index: patches/patch-mk_platform_mk
> ===
> RCS file: patches/patch-mk_platform_mk
> diff -N patches/patch-mk_platform_mk
> --- patches/patch-mk_platform_mk  13 Jan 2016 07:39:08 -  1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -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

Re: [update] lang/rust 1.4.0

[Laurence Tratt]

On Sun, Nov 01, 2015 at 04:49:08PM -0500, Michael McConville wrote:

Hello Michael,

> It's hard to find a big stress-tester program to build without Cargo.

Steven McDonald is working on a Cargo port, which is in openbsd-wip. It's
more than good enough to compile every Rust program I've chucked at it. As I
remember things, the WIP version isn't far off being good enough to consider
for importing into ports.

There are still a number of Rust libraries which have Linux-specific bits
in, but a) the offending parts are nearly always easily fixed b) they're
gradually reducing in number. So more and more things run out of the box on
OpenBSD.


Laurie
-- 
Personal http://tratt.net/laurie/
Software Development Teamhttp://soft-dev.org/
   https://github.com/ltratt  http://twitter.com/laurencetratt

Re: [update] lang/rust 1.4.0

[Sebastien Marie]

On Sun, Nov 01, 2015 at 04:49:08PM -0500, Michael McConville wrote:
> Sebastien Marie wrote:
> > Hi,
> > 
> > Here a patch for updating lang/rust to latest stable version: 1.4.0
> > 
> > Testing would be welcome.
> > 
> > An intermittent failure on `net::addr::tests::to_socket_addr_str_bad'
> > test is possible. It isn't a regress (this problem seems to be present
> > long time ago), but I would like to investigate it a bit with people
> > that are able to reproduce it (my buildhost don't trigger it).
> 
> Built fine for me, after a couple laptop deaths from going >100°C. It's
> hard to find a big stress-tester program to build without Cargo. Does
> anyone have suggestions?
>  

The port comes with a regress test (it is the official regress test of
rustc), so just launch "make test" should be enough for run it.

Thanks for testing.
-- 
Sebastien Marie

Re: [update] lang/rust 1.4.0

[Brandon Mercer]

Tested here on amd64 as well. Looks good to me.

On Sun, Nov 1, 2015 at 4:52 PM Michael McConville  wrote:

> Sebastien Marie wrote:
> > Hi,
> >
> > Here a patch for updating lang/rust to latest stable version: 1.4.0
> >
> > Testing would be welcome.
> >
> > An intermittent failure on `net::addr::tests::to_socket_addr_str_bad'
> > test is possible. It isn't a regress (this problem seems to be present
> > long time ago), but I would like to investigate it a bit with people
> > that are able to reproduce it (my buildhost don't trigger it).
>
> Built fine for me, after a couple laptop deaths from going >100°C. It's
> hard to find a big stress-tester program to build without Cargo. Does
> anyone have suggestions?
>
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/lang/rust/Makefile,v
> > retrieving revision 1.10
> > diff -u -p -r1.10 Makefile
> > --- Makefile  22 Sep 2015 08:11:24 -  1.10
> > +++ Makefile  29 Oct 2015 05:09:39 -
> > @@ -7,8 +7,8 @@ PKG_ARCH-doc =*
> >  COMMENT-main =   compiler for Rust Language
> >  COMMENT-doc =html documentation for rustc
> >
> > -V =  1.3.0
> > -RUST_HASH =  198068b3
> > +V =  1.4.0
> > +RUST_HASH =  1bf6e69c
> >  DISTNAME =   rustc-${V}-src
> >
> >  SUBST_VARS +=RUST_HASH
> > @@ -20,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-07-26-a5c12f4-openbsd-x86_64-8b21d574a65c38e7c7b08d675d8a44cec214.tar.bz2
> > +SNAPSHOT-amd64 =
>  
> rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2
> >
> >  CATEGORIES = lang
> >
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/lang/rust/distinfo,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 distinfo
> > --- distinfo  22 Sep 2015 08:11:24 -  1.6
> > +++ distinfo  29 Oct 2015 05:09:39 -
> > @@ -1,4 +1,4 @@
> > -SHA256
> (rust/rust-stage0-2015-07-26-a5c12f4-openbsd-x86_64-8b21d574a65c38e7c7b08d675d8a44cec214.tar.bz2)
> = jAqcLs1YeRZ8W6jBtX6dK9Tk/zOJaTEWo4bo8YkC8Ok=
> > -SHA256 (rust/rustc-1.3.0-src.tar.gz) =
> 6gLXvJ595bi+P+azfqmyvYI/mlMsjkxH0C838k/6MSY=
> > -SIZE
> (rust/rust-stage0-2015-07-26-a5c12f4-openbsd-x86_64-8b21d574a65c38e7c7b08d675d8a44cec214.tar.bz2)
> = 19831265
> > -SIZE (rust/rustc-1.3.0-src.tar.gz) = 24308223
> > +SHA256
> (rust/rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2)
> = SV8nV81ML4Z1aK3BSyfykjMtIcBS6I+4zX9HYKkbeTk=
> > +SHA256 (rust/rustc-1.4.0-src.tar.gz) =
> HA39zlyF2AmPzrua3xSThHq0DB36qMyZevCbLvCqghE=
> > +SIZE
> (rust/rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2)
> = 19863445
> > +SIZE (rust/rustc-1.4.0-src.tar.gz) = 24537507
> > Index: pkg/PLIST-doc
> > ===
> > RCS file: /cvs/ports/lang/rust/pkg/PLIST-doc,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 PLIST-doc
> > --- pkg/PLIST-doc 22 Sep 2015 08:11:24 -  1.6
> > +++ pkg/PLIST-doc 29 Oct 2015 05:09:50 -
> > @@ -10,16 +10,12 @@ share/doc/rust/html/SourceSerifPro-Bold.
> >  share/doc/rust/html/SourceSerifPro-Regular.woff
> >  share/doc/rust/html/alloc/
> >  share/doc/rust/html/alloc/arc/
> > -share/doc/rust/html/alloc/arc/fn.get_mut.html
> > -share/doc/rust/html/alloc/arc/fn.strong_count.html
> > -share/doc/rust/html/alloc/arc/fn.weak_count.html
> >  share/doc/rust/html/alloc/arc/index.html
> >  share/doc/rust/html/alloc/arc/sidebar-items.js
> >  share/doc/rust/html/alloc/arc/struct.Arc.html
> >  share/doc/rust/html/alloc/arc/struct.Weak.html
> >  share/doc/rust/html/alloc/boxed/
> >  share/doc/rust/html/alloc/boxed/constant.HEAP.html
> > -share/doc/rust/html/alloc/boxed/fn.into_raw.html
> >  share/doc/rust/html/alloc/boxed/index.html
> >  share/doc/rust/html/alloc/boxed/sidebar-items.js
> >  share/doc/rust/html/alloc/boxed/struct.Box.html
> > @@ -33,7 +29,6 @@ share/doc/rust/html/alloc/heap/fn.alloca
> >  share/doc/rust/html/alloc/heap/fn.deallocate.html
> >  share/doc/rust/html/alloc/heap/fn.reallocate.html
> >  share/doc/rust/html/alloc/heap/fn.reallocate_inplace.html
> > -share/doc/rust/html/alloc/heap/fn.stats_print.html
> >  share/doc/rust/html/alloc/heap/fn.usable_size.html
> >  share/doc/rust/html/alloc/heap/index.html
> >  share/doc/rust/html/alloc/heap/sidebar-items.js
> > @@ -43,11 +38,6 @@ share/doc/rust/html/alloc/raw_vec/index.
> >  share/doc/rust/html/alloc/raw_vec/sidebar-items.js
> >  share/doc/rust/html/alloc/raw_vec/struct.RawVec.html
> >  share/doc/rust/html/alloc/rc/
> > -share/doc/rust/html/alloc/rc/fn.get_mut.html
> > 

Re: [update] lang/rust 1.4.0

[Michael McConville]

Sebastien Marie wrote:
> Hi,
> 
> Here a patch for updating lang/rust to latest stable version: 1.4.0
> 
> Testing would be welcome.
> 
> An intermittent failure on `net::addr::tests::to_socket_addr_str_bad'
> test is possible. It isn't a regress (this problem seems to be present
> long time ago), but I would like to investigate it a bit with people
> that are able to reproduce it (my buildhost don't trigger it).

Built fine for me, after a couple laptop deaths from going >100°C. It's
hard to find a big stress-tester program to build without Cargo. Does
anyone have suggestions?
 
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/rust/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile  22 Sep 2015 08:11:24 -  1.10
> +++ Makefile  29 Oct 2015 05:09:39 -
> @@ -7,8 +7,8 @@ PKG_ARCH-doc =*
>  COMMENT-main =   compiler for Rust Language
>  COMMENT-doc =html documentation for rustc
>  
> -V =  1.3.0
> -RUST_HASH =  198068b3
> +V =  1.4.0
> +RUST_HASH =  1bf6e69c
>  DISTNAME =   rustc-${V}-src
>  
>  SUBST_VARS +=RUST_HASH
> @@ -20,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-07-26-a5c12f4-openbsd-x86_64-8b21d574a65c38e7c7b08d675d8a44cec214.tar.bz2
> +SNAPSHOT-amd64 = 
> rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2
>  
>  CATEGORIES = lang
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/rust/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo  22 Sep 2015 08:11:24 -  1.6
> +++ distinfo  29 Oct 2015 05:09:39 -
> @@ -1,4 +1,4 @@
> -SHA256 
> (rust/rust-stage0-2015-07-26-a5c12f4-openbsd-x86_64-8b21d574a65c38e7c7b08d675d8a44cec214.tar.bz2)
>  = jAqcLs1YeRZ8W6jBtX6dK9Tk/zOJaTEWo4bo8YkC8Ok=
> -SHA256 (rust/rustc-1.3.0-src.tar.gz) = 
> 6gLXvJ595bi+P+azfqmyvYI/mlMsjkxH0C838k/6MSY=
> -SIZE 
> (rust/rust-stage0-2015-07-26-a5c12f4-openbsd-x86_64-8b21d574a65c38e7c7b08d675d8a44cec214.tar.bz2)
>  = 19831265
> -SIZE (rust/rustc-1.3.0-src.tar.gz) = 24308223
> +SHA256 
> (rust/rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2)
>  = SV8nV81ML4Z1aK3BSyfykjMtIcBS6I+4zX9HYKkbeTk=
> +SHA256 (rust/rustc-1.4.0-src.tar.gz) = 
> HA39zlyF2AmPzrua3xSThHq0DB36qMyZevCbLvCqghE=
> +SIZE 
> (rust/rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2)
>  = 19863445
> +SIZE (rust/rustc-1.4.0-src.tar.gz) = 24537507
> Index: pkg/PLIST-doc
> ===
> RCS file: /cvs/ports/lang/rust/pkg/PLIST-doc,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST-doc
> --- pkg/PLIST-doc 22 Sep 2015 08:11:24 -  1.6
> +++ pkg/PLIST-doc 29 Oct 2015 05:09:50 -
> @@ -10,16 +10,12 @@ share/doc/rust/html/SourceSerifPro-Bold.
>  share/doc/rust/html/SourceSerifPro-Regular.woff
>  share/doc/rust/html/alloc/
>  share/doc/rust/html/alloc/arc/
> -share/doc/rust/html/alloc/arc/fn.get_mut.html
> -share/doc/rust/html/alloc/arc/fn.strong_count.html
> -share/doc/rust/html/alloc/arc/fn.weak_count.html
>  share/doc/rust/html/alloc/arc/index.html
>  share/doc/rust/html/alloc/arc/sidebar-items.js
>  share/doc/rust/html/alloc/arc/struct.Arc.html
>  share/doc/rust/html/alloc/arc/struct.Weak.html
>  share/doc/rust/html/alloc/boxed/
>  share/doc/rust/html/alloc/boxed/constant.HEAP.html
> -share/doc/rust/html/alloc/boxed/fn.into_raw.html
>  share/doc/rust/html/alloc/boxed/index.html
>  share/doc/rust/html/alloc/boxed/sidebar-items.js
>  share/doc/rust/html/alloc/boxed/struct.Box.html
> @@ -33,7 +29,6 @@ share/doc/rust/html/alloc/heap/fn.alloca
>  share/doc/rust/html/alloc/heap/fn.deallocate.html
>  share/doc/rust/html/alloc/heap/fn.reallocate.html
>  share/doc/rust/html/alloc/heap/fn.reallocate_inplace.html
> -share/doc/rust/html/alloc/heap/fn.stats_print.html
>  share/doc/rust/html/alloc/heap/fn.usable_size.html
>  share/doc/rust/html/alloc/heap/index.html
>  share/doc/rust/html/alloc/heap/sidebar-items.js
> @@ -43,11 +38,6 @@ share/doc/rust/html/alloc/raw_vec/index.
>  share/doc/rust/html/alloc/raw_vec/sidebar-items.js
>  share/doc/rust/html/alloc/raw_vec/struct.RawVec.html
>  share/doc/rust/html/alloc/rc/
> -share/doc/rust/html/alloc/rc/fn.get_mut.html
> -share/doc/rust/html/alloc/rc/fn.is_unique.html
> -share/doc/rust/html/alloc/rc/fn.strong_count.html
> -share/doc/rust/html/alloc/rc/fn.try_unwrap.html
> -share/doc/rust/html/alloc/rc/fn.weak_count.html
>  share/doc/rust/html/alloc/rc/index.html
>  share/doc/rust/html/alloc/rc/sidebar-items.js
>  

[update] lang/rust 1.4.0

[Sebastien Marie]

Hi,

Here a patch for updating lang/rust to latest stable version: 1.4.0

Testing would be welcome.

An intermittent failure on `net::addr::tests::to_socket_addr_str_bad'
test is possible. It isn't a regress (this problem seems to be present
long time ago), but I would like to investigate it a bit with people
that are able to reproduce it (my buildhost don't trigger it).

Thanks.
-- 
Sebastien Marie

Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile22 Sep 2015 08:11:24 -  1.10
+++ Makefile29 Oct 2015 05:09:39 -
@@ -7,8 +7,8 @@ PKG_ARCH-doc =  *
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.3.0
-RUST_HASH =198068b3
+V =1.4.0
+RUST_HASH =1bf6e69c
 DISTNAME = rustc-${V}-src
 
 SUBST_VARS +=  RUST_HASH
@@ -20,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-07-26-a5c12f4-openbsd-x86_64-8b21d574a65c38e7c7b08d675d8a44cec214.tar.bz2
+SNAPSHOT-amd64 =   
rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2
 
 CATEGORIES =   lang
 
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo22 Sep 2015 08:11:24 -  1.6
+++ distinfo29 Oct 2015 05:09:39 -
@@ -1,4 +1,4 @@
-SHA256 
(rust/rust-stage0-2015-07-26-a5c12f4-openbsd-x86_64-8b21d574a65c38e7c7b08d675d8a44cec214.tar.bz2)
 = jAqcLs1YeRZ8W6jBtX6dK9Tk/zOJaTEWo4bo8YkC8Ok=
-SHA256 (rust/rustc-1.3.0-src.tar.gz) = 
6gLXvJ595bi+P+azfqmyvYI/mlMsjkxH0C838k/6MSY=
-SIZE 
(rust/rust-stage0-2015-07-26-a5c12f4-openbsd-x86_64-8b21d574a65c38e7c7b08d675d8a44cec214.tar.bz2)
 = 19831265
-SIZE (rust/rustc-1.3.0-src.tar.gz) = 24308223
+SHA256 
(rust/rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2)
 = SV8nV81ML4Z1aK3BSyfykjMtIcBS6I+4zX9HYKkbeTk=
+SHA256 (rust/rustc-1.4.0-src.tar.gz) = 
HA39zlyF2AmPzrua3xSThHq0DB36qMyZevCbLvCqghE=
+SIZE 
(rust/rust-stage0-2015-08-11-1af31d4-openbsd-x86_64-9cae790c4ca19b1b29a048605ce249fe1c20a498.tar.bz2)
 = 19863445
+SIZE (rust/rustc-1.4.0-src.tar.gz) = 24537507
Index: pkg/PLIST-doc
===
RCS file: /cvs/ports/lang/rust/pkg/PLIST-doc,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-doc
--- pkg/PLIST-doc   22 Sep 2015 08:11:24 -  1.6
+++ pkg/PLIST-doc   29 Oct 2015 05:09:50 -
@@ -10,16 +10,12 @@ share/doc/rust/html/SourceSerifPro-Bold.
 share/doc/rust/html/SourceSerifPro-Regular.woff
 share/doc/rust/html/alloc/
 share/doc/rust/html/alloc/arc/
-share/doc/rust/html/alloc/arc/fn.get_mut.html
-share/doc/rust/html/alloc/arc/fn.strong_count.html
-share/doc/rust/html/alloc/arc/fn.weak_count.html
 share/doc/rust/html/alloc/arc/index.html
 share/doc/rust/html/alloc/arc/sidebar-items.js
 share/doc/rust/html/alloc/arc/struct.Arc.html
 share/doc/rust/html/alloc/arc/struct.Weak.html
 share/doc/rust/html/alloc/boxed/
 share/doc/rust/html/alloc/boxed/constant.HEAP.html
-share/doc/rust/html/alloc/boxed/fn.into_raw.html
 share/doc/rust/html/alloc/boxed/index.html
 share/doc/rust/html/alloc/boxed/sidebar-items.js
 share/doc/rust/html/alloc/boxed/struct.Box.html
@@ -33,7 +29,6 @@ share/doc/rust/html/alloc/heap/fn.alloca
 share/doc/rust/html/alloc/heap/fn.deallocate.html
 share/doc/rust/html/alloc/heap/fn.reallocate.html
 share/doc/rust/html/alloc/heap/fn.reallocate_inplace.html
-share/doc/rust/html/alloc/heap/fn.stats_print.html
 share/doc/rust/html/alloc/heap/fn.usable_size.html
 share/doc/rust/html/alloc/heap/index.html
 share/doc/rust/html/alloc/heap/sidebar-items.js
@@ -43,11 +38,6 @@ share/doc/rust/html/alloc/raw_vec/index.
 share/doc/rust/html/alloc/raw_vec/sidebar-items.js
 share/doc/rust/html/alloc/raw_vec/struct.RawVec.html
 share/doc/rust/html/alloc/rc/
-share/doc/rust/html/alloc/rc/fn.get_mut.html
-share/doc/rust/html/alloc/rc/fn.is_unique.html
-share/doc/rust/html/alloc/rc/fn.strong_count.html
-share/doc/rust/html/alloc/rc/fn.try_unwrap.html
-share/doc/rust/html/alloc/rc/fn.weak_count.html
 share/doc/rust/html/alloc/rc/index.html
 share/doc/rust/html/alloc/rc/sidebar-items.js
 share/doc/rust/html/alloc/rc/struct.Rc.html
@@ -55,12 +45,12 @@ share/doc/rust/html/alloc/rc/struct.Weak
 share/doc/rust/html/alloc/sidebar-items.js
 share/doc/rust/html/book/
 share/doc/rust/html/book/README.html
-share/doc/rust/html/book/academic-research.html
 share/doc/rust/html/book/advanced-linking.html
 share/doc/rust/html/book/associated-constants.html
 

[update] lang/rust 1.2.0

[Sebastien Marie]

Hi,

Here a patch for lang/rust:
  - update to latest stable version (1.2.0)
  - change my maintener email address

Comments ? OKs ?
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile27 Jun 2015 15:37:32 -  1.8
+++ Makefile7 Aug 2015 10:27:35 -
@@ -7,8 +7,8 @@ PKG_ARCH-doc =  *
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.1.0
-RUST_HASH =7d23ff90
+V =1.2.0
+RUST_HASH =62abc69f
 DISTNAME = rustc-${V}-src
 
 SUBST_VARS +=  RUST_HASH
@@ -20,13 +20,13 @@ 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-04-27-857ef6e-openbsd-x86_64-20046defe7d1f3f37e25b5b2714cd54e61cabc61.tar.bz2
+SNAPSHOT-amd64 =   
rust-stage0-2015-05-24-ba0e1cd-openbsd-x86_64-7c249db2a0f4e6ace9c3a343ba62c990635d665a.tar.bz2
 
 CATEGORIES =   lang
 
 HOMEPAGE = http://www.rust-lang.org/
 
-MAINTAINER =   Sebastien Marie semarie-open...@latrappe.fr
+MAINTAINER =   Sebastien Marie sema...@openbsd.org
 
 # both MIT and Apache2.0
 # with portions covered by various BSD-like licenses
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo27 Jun 2015 15:37:32 -  1.4
+++ distinfo7 Aug 2015 10:27:35 -
@@ -1,4 +1,4 @@
-SHA256 
(rust/rust-stage0-2015-04-27-857ef6e-openbsd-x86_64-20046defe7d1f3f37e25b5b2714cd54e61cabc61.tar.bz2)
 = ILsUM56erMu4Kb7LOM6mSK5eYKlLQFYCs83qXJw6sdc=
-SHA256 (rust/rustc-1.1.0-src.tar.gz) = 
ywn0Q7N+wbgf5zwE60E/n2VoWc99ALxQiACMvCpj+oo=
-SIZE 
(rust/rust-stage0-2015-04-27-857ef6e-openbsd-x86_64-20046defe7d1f3f37e25b5b2714cd54e61cabc61.tar.bz2)
 = 19396926
-SIZE (rust/rustc-1.1.0-src.tar.gz) = 22241376
+SHA256 
(rust/rust-stage0-2015-05-24-ba0e1cd-openbsd-x86_64-7c249db2a0f4e6ace9c3a343ba62c990635d665a.tar.bz2)
 = j8GSlIIQNgTcC+9rxEh25fa6YaxlM1a7yT8AtniyoEU=
+SHA256 (rust/rustc-1.2.0-src.tar.gz) = 
6m65g9ryoHPfVxhqWPDUzg6FxxG+wTxieoyF1RtqbXg=
+SIZE 
(rust/rust-stage0-2015-05-24-ba0e1cd-openbsd-x86_64-7c249db2a0f4e6ace9c3a343ba62c990635d665a.tar.bz2)
 = 19611016
+SIZE (rust/rustc-1.2.0-src.tar.gz) = 23863924
Index: patches/patch-configure
===
RCS file: /cvs/ports/lang/rust/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 27 Jun 2015 15:37:32 -  1.2
+++ patches/patch-configure 7 Aug 2015 10:27:35 -
@@ -2,29 +2,24 @@ $OpenBSD: patch-configure,v 1.2 2015/06/
 Remove requirement for curl or wget.
 The snapshot isn't downloaded but copied by post-configure.
 
-Switch hash command stripping from head -c to cut -c
-https://github.com/rust-lang/rust/pull/25648
 configure.orig Sun May 17 00:07:32 2015
-+++ configure  Sun May 24 09:14:46 2015
-@@ -692,7 +692,7 @@ putvar CFG_BOOTSTRAP_KEY
+Allow LLVM version 3.7
+--- configure.orig Tue Aug  4 21:28:47 2015
 configure  Fri Aug  7 06:37:54 2015
+@@ -696,7 +696,7 @@ putvar CFG_BOOTSTRAP_KEY
  
  step_msg looking for build programs
  
 -probe_need CFG_CURLORWGET  curl wget
 +probe CFG_CURLORWGET  curl wget
- probe_need CFG_PYTHON  python2.7 python2.6 python2 python
- 
- python_version=$($CFG_PYTHON -V 21)
-@@ -716,10 +716,10 @@ probe CFG_MD5  md5
- probe CFG_MD5SUM   md5sum
- if [ -n $CFG_MD5 ]
- then
--CFG_HASH_COMMAND=$CFG_MD5 -q | head -c 8
-+CFG_HASH_COMMAND=$CFG_MD5 -q | cut -c 1-8
- elif [ -n $CFG_MD5SUM ]
- then
--CFG_HASH_COMMAND=$CFG_MD5SUM | head -c 8
-+CFG_HASH_COMMAND=$CFG_MD5SUM | cut -c 1-8
- else
- err 'could not find one of: md5 md5sum'
+ if [ -z $CFG_PYTHON_PROVIDED ]; then
+ probe_need CFG_PYTHON  python2.7 python2.6 python2 python
  fi
+@@ -920,7 +920,7 @@ then
+ LLVM_VERSION=$($LLVM_CONFIG --version)
+ 
+ case $LLVM_VERSION in
+-(3.[5-6]*)
++(3.[5-7]*)
+ msg found ok version of LLVM: $LLVM_VERSION
+ ;;
+ (*)
Index: patches/patch-src_etc_mklldeps_py
===
RCS file: /cvs/ports/lang/rust/patches/patch-src_etc_mklldeps_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_etc_mklldeps_py
--- patches/patch-src_etc_mklldeps_py   6 Apr 2015 16:01:05 -   1.1.1.1
+++ patches/patch-src_etc_mklldeps_py   7 Aug 2015 10:27:35 -
@@ -1,19 +1,23 @@
 $OpenBSD: patch-src_etc_mklldeps_py,v 1.1.1.1 2015/04/06 16:01:05 landry Exp $
 Configure linking to estdc++ (stdc++ library from 

Re: [maintener update] lang/rust: ping + beta2

[semarie-openbsd]

On Sat, Apr 18, 2015 at 11:43:53AM +0200, Landry Breuil wrote:
 On Sat, Apr 18, 2015 at 07:15:08AM +0200, Sébastien Marie wrote:
  On Sat, Apr 18, 2015 at 06:17:18AM +0200, Sébastien Marie wrote:
   Hi,
   
   This patch include:
- the previous patch to disambiguate linkage (not yet commited)
- update to rust-1.0.0beta1
   
  
  It should be better with patch included. 
  
  And the update isn't beta1 but beta2...
 
 One test failed, dunno if its expected:

not really expected but stack-overflow detection is a moving target...
I don't think it is a regression.

The problem per se isn't too grave: the test check if stack overflow is
correctly detected as stack overflow by rust.

THe normal behaviour is when a SIGSEGV is catch, the program check if it
is due to stack-overflow. If yes, then an error-message is issued before
killing the program. Else the program is just killed.

The stack overflow detection in rust is implemented using
pthread_stackseg_np(3). But it only provides a rough estimation of
stack bounds. So the detection could fail. The program is killed
without a nice message saying:

thread 'main' has overflowed its stack

 failures:
 [run-pass] run-pass/out-of-stack.rs
 
 test result: FAILED. 2021 passed; 1 failed; 25 ignored; 0 measured
 
 Other than that looks good to me.
 

So it isn't a blocking problem for me.

Thanks for your feedback.
-- 
Sébastien Marie

Re: [maintener update] lang/rust: ping + beta2

[Landry Breuil]

On Sat, Apr 18, 2015 at 07:15:08AM +0200, Sébastien Marie wrote:
 On Sat, Apr 18, 2015 at 06:17:18AM +0200, Sébastien Marie wrote:
  Hi,
  
  This patch include:
   - the previous patch to disambiguate linkage (not yet commited)
   - update to rust-1.0.0beta1
  
 
 It should be better with patch included. 
 
 And the update isn't beta1 but beta2...

One test failed, dunno if its expected:

error: test run failed!
status: exit code: 101
command: 
x86_64-unknown-openbsd/test/run-pass/out-of-stack.stage2-x86_64-unknown-openbsd 
stdout:
--

--
stderr:
--
thread 'main' panicked at 'assertion failed: error.contains(has overflowed 
its stack)', 
/usr/obj/ports/rust-1.0.0beta2/rustc-1.0.0-beta.2/src/test/run-pass/out-of-stack.rs:46

--

thread '[run-pass] run-pass/out-of-stack.rs' panicked at 'explicit panic', 
/usr/obj/ports/rust-1.0.0beta2/rustc-1.0.0-beta.2/src/compiletest/runtest.rs:1499



failures:
[run-pass] run-pass/out-of-stack.rs

test result: FAILED. 2021 passed; 1 failed; 25 ignored; 0 measured


Other than that looks good to me.

Landry

Re: [maintener update] lang/rust: ping + beta1

[Sébastien Marie]

Hi,

This patch include:
 - the previous patch to disambiguate linkage (not yet commited)
 - update to rust-1.0.0beta1

On Wed, Apr 15, 2015 at 04:10:42PM +0200, Sébastien Marie wrote:
 
 It provide a correction to permit to build lang/rust whereas
 gcc-libs-4.9.* is installed (+ some cleanup in comments).
 
 The problem with gcc-libs-4.9.* is the package include a
 libestdc++.so.17.0 file.
 
 The lang/rust is normally linked with libestdc++.so.16.0, but without
 this patch, it could be linked with libestdc++.so.17.0 if present.
 
 The patch disambiguate the linkage.
 

Please commit or feedback.

Thanks.
-- 
Sébastien Marie