CVS commit: pkgsrc/lang/llvm

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jun  4 10:22:17 UTC 2019

Modified Files:
        pkgsrc/lang/llvm: Makefile distinfo
Added Files:
        pkgsrc/lang/llvm/patches: patch-utils_FileCheck_FileCheck.cpp

Log Message:
llvm: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/llvm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/llvm/patches/patch-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/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.39 pkgsrc/lang/llvm/Makefile:1.40
--- pkgsrc/lang/llvm/Makefile:1.39      Sun Jun  2 08:35:55 2019
+++ pkgsrc/lang/llvm/Makefile   Tue Jun  4 10:22:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/06/02 08:35:55 adam Exp $
+# $NetBSD: Makefile,v 1.40 2019/06/04 10:22:17 jperkin Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -75,10 +75,11 @@ TEST_ENV+=          LD_LIBRARY_PATH=${WRKDIR}/bu
 
 # It may be that the Solaris linker is more strict here and they can be removed on
 # all platforms.  Change this to a patch if verified.
-SUBST_CLASSES.SunOS+=  lto
-SUBST_STAGE.lto=       pre-configure
-SUBST_FILES.lto=       tools/lto/lto.exports
-SUBST_SED.lto=         -e '/^LLVM/d'
+SUBST_CLASSES.SunOS+=  linkmap
+SUBST_STAGE.linkmap=   pre-configure
+SUBST_FILES.linkmap=   tools/lto/lto.exports
+SUBST_FILES.linkmap+=  tools/opt-remarks/OptRemarks.exports
+SUBST_SED.linkmap=     -e '/^LLVM/d'
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/lang/llvm/distinfo
diff -u pkgsrc/lang/llvm/distinfo:1.20 pkgsrc/lang/llvm/distinfo:1.21
--- pkgsrc/lang/llvm/distinfo:1.20      Sun Jun  2 08:35:55 2019
+++ pkgsrc/lang/llvm/distinfo   Tue Jun  4 10:22:17 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2019/06/02 08:35:55 adam Exp $
+$NetBSD: distinfo,v 1.21 2019/06/04 10:22:17 jperkin Exp $
 
 SHA1 (llvm-8.0.0.src.tar.xz) = 0689345d73911e24a07b24cc82dab4fb46b8c323
 RMD160 (llvm-8.0.0.src.tar.xz) = a0740d83ae981506ddb7cfd389cafc52b7f317b2
@@ -12,3 +12,4 @@ SHA1 (patch-cmake_modules_HandleLLVMOpti
 SHA1 (patch-include_llvm-c_DataTypes.h) = 025c035e0e10871727391bd58936bd67b3e58244
 SHA1 (patch-include_llvm_Analysis_ConstantFolding.h) = 56b9374da236c346565897977040255b9766cab8
 SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 6c74713de3f953cbe323b3a83ca8e8d66f76f6e8
+SHA1 (patch-utils_FileCheck_FileCheck.cpp) = eec6cdd1bdd217ee4fd16a297ff4b8483639e714

Added files:

Index: pkgsrc/lang/llvm/patches/patch-utils_FileCheck_FileCheck.cpp
diff -u /dev/null pkgsrc/lang/llvm/patches/patch-utils_FileCheck_FileCheck.cpp:1.1
--- /dev/null   Tue Jun  4 10:22:17 2019
+++ pkgsrc/lang/llvm/patches/patch-utils_FileCheck_FileCheck.cpp        Tue Jun  4 10:22:17 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-utils_FileCheck_FileCheck.cpp,v 1.1 2019/06/04 10:22:17 jperkin Exp $
+
+Avoid ambiguous function call.
+
+--- utils/FileCheck/FileCheck.cpp.orig 2019-02-12 15:22:48.000000000 +0000
++++ 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((double)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