CVS commit: pkgsrc/lang/rust

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Nov 11 10:28:34 UTC 2019

Modified Files:
        pkgsrc/lang/rust: Makefile distinfo
        pkgsrc/lang/rust/patches: patch-src_libunwind_build.rs

Log Message:
Undo insertion of tabs in rust source, as this would make the
test target fail.  Thanks jperkin!
Also, bump NetBSD/sparc64 bootstrap to 1.38.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.92 -r1.93 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/lang/rust/patches/patch-src_libunwind_build.rs

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.124 pkgsrc/lang/rust/Makefile:1.125
--- pkgsrc/lang/rust/Makefile:1.124     Mon Nov 11 09:09:11 2019
+++ pkgsrc/lang/rust/Makefile   Mon Nov 11 10:28:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2019/11/11 09:09:11 he Exp $
+# $NetBSD: Makefile,v 1.125 2019/11/11 10:28:34 he Exp $
 
 DISTNAME=      rustc-1.39.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -252,7 +252,7 @@ SITES.${RUST_STD_STAGE0}=   ${MASTER_SITE_
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=       1.37.0
+RUST_STAGE0_VER=       1.38.0
 RUST_ARCH=             sparc64-unknown-netbsd
 RUST_STAGE0:=          rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=      rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz

Index: pkgsrc/lang/rust/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.92 pkgsrc/lang/rust/distinfo:1.93
--- pkgsrc/lang/rust/distinfo:1.92      Mon Nov 11 09:09:11 2019
+++ pkgsrc/lang/rust/distinfo   Mon Nov 11 10:28:34 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.92 2019/11/11 09:09:11 he Exp $
+$NetBSD: distinfo,v 1.93 2019/11/11 10:28:34 he 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
@@ -114,7 +114,7 @@ SHA1 (patch-src_librustc__target_spec_so
 SHA1 (patch-src_librustc__target_spec_x86__64__sun__solaris.rs) = f6ad33b41906bbf83a1cbd0e2fe13a4da37266fa
 SHA1 (patch-src_libstd_build.rs) = 9cfa91a11a575d5fef6d3e208864745a24770850
 SHA1 (patch-src_libstd_sys_unix_thread.rs) = 2554f1a42afaa0ddce5053860f4dabecdf6c527a
-SHA1 (patch-src_libunwind_build.rs) = 33fe6fd2027cb7070424e9a30c05438586b5c6b7
+SHA1 (patch-src_libunwind_build.rs) = 723ded63580812f74d04c447f90925725ae9bfc9
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = d49503d19c30a64d571eb7fa79e7aad7038cd427
 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = c5e74d0e8deb555881ec94920a637b53b744c866
 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = 7588a46aaa277ef04b33ac6d904b9d1d81579f2a

Index: pkgsrc/lang/rust/patches/patch-src_libunwind_build.rs
diff -u pkgsrc/lang/rust/patches/patch-src_libunwind_build.rs:1.3 pkgsrc/lang/rust/patches/patch-src_libunwind_build.rs:1.4
--- pkgsrc/lang/rust/patches/patch-src_libunwind_build.rs:1.3   Mon Nov 11 09:09:11 2019
+++ pkgsrc/lang/rust/patches/patch-src_libunwind_build.rs       Mon Nov 11 10:28:34 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_libunwind_build.rs,v 1.3 2019/11/11 09:09:11 he Exp $
+$NetBSD: patch-src_libunwind_build.rs,v 1.4 2019/11/11 10:28:34 he Exp $
 
 fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
 
@@ -9,9 +9,9 @@ fix build on NetBSD HEAD-llvm. XXX there
          println!("cargo:rustc-link-lib=unwind");
      } else if target.contains("netbsd") {
 -        println!("cargo:rustc-link-lib=gcc_s");
-+      if !env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
++        if !env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
 +            println!("cargo:rustc-link-lib=gcc_s");
-+      }
++        }
      } else if target.contains("openbsd") {
          if target.contains("sparc64") {
              println!("cargo:rustc-link-lib=gcc");