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 -0000 1.13
> +++ Makefile 21 Jan 2016 07:51:49 -0000
> @@ -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 -0000 1.8
> +++ distinfo 21 Jan 2016 07:51:49 -0000
> @@ -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 -0000 1.5
> +++ patches/patch-configure 21 Jan 2016 07:51:49 -0000
> @@ -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
> -+++ configure Tue Dec 15 06:46:14 2015
> -@@ -721,7 +721,7 @@ putvar CFG_BOOTSTRAP_KEY
> +--- configure.orig Wed Jan 20 04:37:51 2016
> ++++ configure Wed 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 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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
