CVS commit: pkgsrc/lang/rust

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May 22 09:43:15 UTC 2019

Modified Files:
        pkgsrc/lang/rust: distinfo
Added Files:
        pkgsrc/lang/rust/patches:
            patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp

Log Message:
rust: Avoid ambiguous function call.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp

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/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.75 pkgsrc/lang/rust/distinfo:1.76
--- pkgsrc/lang/rust/distinfo:1.75      Tue May 21 18:00:46 2019
+++ pkgsrc/lang/rust/distinfo   Wed May 22 09:43:14 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2019/05/21 18:00:46 jperkin Exp $
+$NetBSD: distinfo,v 1.76 2019/05/22 09:43:14 jperkin Exp $
 
 SHA1 (rust-1.33.0-i686-apple-darwin.tar.gz) = 3747f4e11ef6d3229bfd41dbdd9990897f9dea83
 RMD160 (rust-1.33.0-i686-apple-darwin.tar.gz) = 32d72b91d159a98470bbfaff4e1087f8b15eb3b9
@@ -117,6 +117,7 @@ SHA1 (patch-src_llvm-project_llvm_CMakeL
 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 19daf5f8a26bfaebca942b5cbe8521fb060fe8d9
 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = 7588a46aaa277ef04b33ac6d904b9d1d81579f2a
 SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6
+SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 498395d1ae5b791b9e4710a856fdebe2fb87011e
 SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80
 SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = b50d65cfd2fea4793bcbec2515f5fc0203052ac0
 SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7

Added files:

Index: pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
diff -u /dev/null pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp:1.1
--- /dev/null   Wed May 22 09:43:15 2019
+++ pkgsrc/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp  Wed May 22 09:43:14 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp,v 1.1 2019/05/22 09:43:14 jperkin Exp $
+
+Avoid ambiguous function call.
+
+--- src/llvm-project/llvm/utils/FileCheck/FileCheck.cpp.orig   2019-02-12 15:22:48.000000000 +0000
++++ src/llvm-project/llvm/utils/FileCheck/FileCheck.cpp
+@@ -403,7 +403,7 @@ static void DumpAnnotatedInput(raw_ostre
+   unsigned LineCount = InputFileText.count('\n');
+   if (InputFileEnd[-1] != '\n')
+     ++LineCount;
+-  unsigned LineNoWidth = log10(LineCount) + 1;
++  unsigned LineNoWidth = log10((float)LineCount) + 1;
+   // +3 below adds spaces (1) to the left of the (right-aligned) line numbers
+   // on input lines and (2) to the right of the (left-aligned) labels on
+   // annotation lines so that input lines and annotation lines are more