On Thu, Aug 15 2019, Sebastien Marie <sema...@online.fr> 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 -0000 1.99
> +++ Makefile 15 Aug 2019 17:13:14 -0000
> @@ -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
