[pkgsrc/trunk]: pkgsrc/lang/rust rust: Put back SunOS fix lost in previous up...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/06a71639c609
branches:  trunk
changeset: 328478:06a71639c609
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jan 22 09:17:15 2019 +0000

description:
rust: Put back SunOS fix lost in previous update.

diffstat:

 lang/rust/Makefile                                 |   5 ++++-
 lang/rust/distinfo                                 |   3 ++-
 lang/rust/patches/patch-vendor_rand_src_rngs_os.rs |  15 +++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r 853a59a8f45d -r 06a71639c609 lang/rust/Makefile
--- a/lang/rust/Makefile        Tue Jan 22 09:12:09 2019 +0000
+++ b/lang/rust/Makefile        Tue Jan 22 09:17:15 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2019/01/20 17:12:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.76 2019/01/22 09:17:15 jperkin Exp $
 
 DISTNAME=      rustc-1.32.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -280,6 +280,9 @@
                ${TOOLS_BASH} ./install.sh --prefix=${RUST_BOOTSTRAP_PATH};     \
        fi
 # patch(1) in NetBSD does not handle .cargo-checksum.json like long width file.
+       ${CP} ${WRKSRC}/vendor/rand/.cargo-checksum.json \
+             ${WRKSRC}/vendor/rand/.cargo-checksum.json.orig
+       ${SED} -e 's/cb94a0b54e47022b2e9b58b45e0196785c61d083760333276226da435cc040d9/bcb195562cf830c9e2078757e6d0976f86ede59816ff305e21a2764a4a4cf43e/' 
${WRKSRC}/vendor/rand/.cargo-checksum.json.orig > ${WRKSRC}/vendor/rand/.cargo-checksum.json
 
 .if ${OPSYS} == "NetBSD"
        SDIR=${WRKDIR}/scripts; \
diff -r 853a59a8f45d -r 06a71639c609 lang/rust/distinfo
--- a/lang/rust/distinfo        Tue Jan 22 09:12:09 2019 +0000
+++ b/lang/rust/distinfo        Tue Jan 22 09:17:15 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2019/01/19 12:44:08 ryoon Exp $
+$NetBSD: distinfo,v 1.53 2019/01/22 09:17:15 jperkin Exp $
 
 SHA1 (rust-1.31.0-x86_64-sun-solaris.tar.gz) = 782763ddcfb58df6d522aa8b66286e01451c6cb5
 RMD160 (rust-1.31.0-x86_64-sun-solaris.tar.gz) = ad93cf10e3b21c63989310b49ea6874520062400
@@ -116,3 +116,4 @@
 SHA1 (patch-src_tools_rls_src_cmd.rs) = 754bfb8806e209cb0ef01690b48bf4b145017ab9
 SHA1 (patch-src_tools_rls_src_server_io.rs) = 74b90c1aeb70b0c3a20709145d6568ddf4647877
 SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773d5827503ad07d0913dc2
+SHA1 (patch-vendor_rand_src_rngs_os.rs) = 7a1c6d91d9418e1f8e378c4baca33045cc768f2d
diff -r 853a59a8f45d -r 06a71639c609 lang/rust/patches/patch-vendor_rand_src_rngs_os.rs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/rust/patches/patch-vendor_rand_src_rngs_os.rs        Tue Jan 22 09:17:15 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-vendor_rand_src_rngs_os.rs,v 1.1 2019/01/22 09:17:15 jperkin Exp $
+
+Explicitly disable getrandom support on SunOS, the test fails.
+https://github.com/rust-random/rand/issues/637
+
+--- vendor/rand/src/rngs/os.rs.orig    2019-01-16 11:06:08.000000000 +0000
++++ vendor/rand/src/rngs/os.rs
+@@ -675,6 +675,7 @@ mod imp {
+     }
+ 
+     fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long {
++        return -1;
+         extern "C" {
+             fn syscall(number: libc::c_long, ...) -> libc::c_long;
+         }