CVS commit: pkgsrc/lang/rust

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Oct 28 00:42:21 UTC 2019

Modified Files:
        pkgsrc/lang/rust: Makefile distinfo
Added Files:
        pkgsrc/lang/rust/patches: patch-vendor_lzma-sys_config.h

Log Message:
rust: Fix SunOS builds with newer compilers.


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/rust/patches/patch-vendor_lzma-sys_config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.119 pkgsrc/lang/rust/Makefile:1.120
--- pkgsrc/lang/rust/Makefile:1.119     Sun Oct 27 18:34:27 2019
+++ pkgsrc/lang/rust/Makefile   Mon Oct 28 00:42:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2019/10/27 18:34:27 he Exp $
+# $NetBSD: Makefile,v 1.120 2019/10/28 00:42:21 jperkin Exp $
 
 DISTNAME=      rustc-1.38.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -316,6 +316,9 @@ post-extract:
        ${CP} ${WRKSRC}/vendor/backtrace-sys/.cargo-checksum.json \
              ${WRKSRC}/vendor/backtrace-sys/.cargo-checksum.json.orig
        ${SED} -e 's/59763fc255248b54fba5d0761d61093a73d51fa4cb400b0df1b5f339b9c2f48a/ba66d192421fd536ceddb50616c4c4aea06f4e39450eb0bc2bbbaed0b1e684c1/' 
${WRKSRC}/vendor/backtrace-sys/.cargo-checksum.json.orig > ${WRKSRC}/vendor/backtrace-sys/.cargo-checksum.json
+       ${CP} ${WRKSRC}/vendor/lzma-sys/.cargo-checksum.json \
+               ${WRKSRC}/vendor/lzma-sys/.cargo-checksum.json.orig
+       ${SED} -e 's/51a9ca7a4576822dc4fa01b31bc4bbed21817777abb304f605ef5951f68c3ed2/807c3aa4b5a62a70ba790df151e9ecf19f4bb562f2858575d690908751262db3/' 
${WRKSRC}/vendor/lzma-sys/.cargo-checksum.json.orig > ${WRKSRC}/vendor/lzma-sys/.cargo-checksum.json
 .if ${OPSYS} == "NetBSD"
        SDIR=${WRKDIR}/scripts; \
        ${MKDIR} $${SDIR}; \

Index: pkgsrc/lang/rust/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.90 pkgsrc/lang/rust/distinfo:1.91
--- pkgsrc/lang/rust/distinfo:1.90      Sun Oct 27 18:34:27 2019
+++ pkgsrc/lang/rust/distinfo   Mon Oct 28 00:42:21 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2019/10/27 18:34:27 he Exp $
+$NetBSD: distinfo,v 1.91 2019/10/28 00:42:21 jperkin Exp $
 
 SHA1 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 91517fa95f954427c627cf63eb7c518abd068f3e
 RMD160 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 06a3d922b27aac2deb570301542897a131b47cd0
@@ -129,4 +129,5 @@ SHA1 (patch-src_tools_rust-installer_ins
 SHA1 (patch-src_vendor_rand-0.6.1_src_rngs_os.rs) = c068ae41fb69a524336efcef7df7a9d1326d04f1
 SHA1 (patch-vendor_backtrace-sys_src_libbacktrace_configure) = 90e54f66edce65ebe23fbf2480deb193ca926733
 SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 804ea03be546fef0d2bd37d7f8abb26d38a7892b
+SHA1 (patch-vendor_lzma-sys_config.h) = ab963fc8d7a847715e0e0dc2928333efe38e923f
 SHA1 (patch-vendor_rand__os_src_netbsd.rs) = 049df63c904abd81cb92f33fa0882f5c81cae51a

Added files:

Index: pkgsrc/lang/rust/patches/patch-vendor_lzma-sys_config.h
diff -u /dev/null pkgsrc/lang/rust/patches/patch-vendor_lzma-sys_config.h:1.1
--- /dev/null   Mon Oct 28 00:42:21 2019
+++ pkgsrc/lang/rust/patches/patch-vendor_lzma-sys_config.h     Mon Oct 28 00:42:21 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-vendor_lzma-sys_config.h,v 1.1 2019/10/28 00:42:21 jperkin Exp $
+
+Fix SunOS builds with newer compilers.
+
+--- vendor/lzma-sys/config.h.orig      2019-09-23 23:15:03.000000000 +0000
++++ vendor/lzma-sys/config.h
+@@ -35,6 +35,10 @@
+     // change to `MYTHREAD_WIN95` if targeting Windows XP or earlier
+     #define MYTHREAD_VISTA 1
+ #else
++#if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+     #define _POSIX_C_SOURCE 199506L
++#else
++    #define _POSIX_C_SOURCE 200112L
++#endif
+     #define MYTHREAD_POSIX 1
+ #endif