Thu Jul 2 10:45:38 2020 UTC ()
clang: update to 10.0.0nb4.

Make perl a run-time dependency to fix

ERROR: [check-interpreter.mk] The interpreter "/usr/pkg/bin/perl" of "/usr/pkg/bin/scan-build" does not exist.
ERROR: [check-interpreter.mk] The interpreter "/usr/pkg/bin/perl" of "/usr/pkg/libexec/c++-analyzer" does not exist.
ERROR: [check-interpreter.mk] The interpreter "/usr/pkg/bin/perl" of "/usr/pkg/libexec/ccc-analyzer" does not exist.


(wiz)
diff -r1.57 -r1.58 pkgsrc/lang/clang/Makefile
diff -r1.45 -r1.46 pkgsrc/lang/clang/Makefile.common
cvs diff -r1.57 -r1.58 pkgsrc/lang/clang/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/clang/Makefile 2020/07/01 14:46:37 1.57
+++ pkgsrc/lang/clang/Makefile 2020/07/02 10:45:38 1.58
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile,v 1.57 2020/07/01 14:46:37 adam Exp $ 1# $NetBSD: Makefile,v 1.58 2020/07/02 10:45:38 wiz Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/.src//} 5PKGNAME= ${DISTNAME:S/.src//}
6PKGREVISION= 3 6PKGREVISION= 4
7 7
8PYTHON_FOR_BUILD_ONLY= yes 8PYTHON_FOR_BUILD_ONLY= yes
9 9
 10USE_TOOLS+= perl:run
 11
10# There are some contrib utilities written in python here. 12# There are some contrib utilities written in python here.
11# We don't want to add a python runtime dependency for that. 13# We don't want to add a python runtime dependency for that.
12CHECK_INTERPRETER_SKIP+= share/clang/* 14CHECK_INTERPRETER_SKIP+= share/clang/*
13 15
14.include "../../mk/bsd.pkg.mk" 16.include "../../mk/bsd.pkg.mk"
cvs diff -r1.45 -r1.46 pkgsrc/lang/clang/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/clang/Makefile.common 2020/07/01 14:46:37 1.45
+++ pkgsrc/lang/clang/Makefile.common 2020/07/02 10:45:38 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.45 2020/07/01 14:46:37 adam Exp $ 1# $NetBSD: Makefile.common,v 1.46 2020/07/02 10:45:38 wiz Exp $
2# used by lang/clang/Makefile 2# used by lang/clang/Makefile
3# used by lang/clang-tools-extra/Makefile 3# used by lang/clang-tools-extra/Makefile
4 4
5.include "../../lang/llvm/version.mk" 5.include "../../lang/llvm/version.mk"
6 6
7DISTNAME= clang-${LLVM_VERSION}.src 7DISTNAME= clang-${LLVM_VERSION}.src
8CATEGORIES= lang devel 8CATEGORIES= lang devel
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://clang.llvm.org/ 11HOMEPAGE= https://clang.llvm.org/
12COMMENT= C language family frontend for LLVM 12COMMENT= C language family frontend for LLVM
13LICENSE= apache-2.0 13LICENSE= apache-2.0
14 14
@@ -58,27 +58,27 @@ REPLACE_PYTHON+= utils/TestUtils/deep-st @@ -58,27 +58,27 @@ REPLACE_PYTHON+= utils/TestUtils/deep-st
58REPLACE_PYTHON+= utils/analyzer/CmpRuns.py 58REPLACE_PYTHON+= utils/analyzer/CmpRuns.py
59REPLACE_PYTHON+= utils/analyzer/SATestAdd.py 59REPLACE_PYTHON+= utils/analyzer/SATestAdd.py
60REPLACE_PYTHON+= utils/analyzer/SATestBuild.py 60REPLACE_PYTHON+= utils/analyzer/SATestBuild.py
61REPLACE_PYTHON+= utils/analyzer/SumTimerInfo.py 61REPLACE_PYTHON+= utils/analyzer/SumTimerInfo.py
62REPLACE_PYTHON+= utils/check_cfc/check_cfc.py 62REPLACE_PYTHON+= utils/check_cfc/check_cfc.py
63REPLACE_PYTHON+= utils/check_cfc/obj_diff.py 63REPLACE_PYTHON+= utils/check_cfc/obj_diff.py
64REPLACE_PYTHON+= utils/check_cfc/test_check_cfc.py 64REPLACE_PYTHON+= utils/check_cfc/test_check_cfc.py
65REPLACE_PYTHON+= utils/hmaptool/hmaptool 65REPLACE_PYTHON+= utils/hmaptool/hmaptool
66REPLACE_PYTHON+= utils/token-delta.py 66REPLACE_PYTHON+= utils/token-delta.py
67REPLACE_PYTHON+= www/builtins.py 67REPLACE_PYTHON+= www/builtins.py
68 68
69.if ${OPSYS} == "NetBSD" && ${PKGSRC_COMPILER:Mclang} 69.if ${OPSYS} == "NetBSD" && ${PKGSRC_COMPILER:Mclang}
70# command to check if clang is using libc++ or libstdc++ 70# command to check if clang is using libc++ or libstdc++
71LIBCPP_CHECK!= \ 71LIBCPP_CHECK!= \
72 printf '%s\n' \ 72 printf '%s\n' \
73 '\#include <ciso646>' \ 73 '\#include <ciso646>' \
74 '\#ifdef _LIBCPP_VERSION' \ 74 '\#ifdef _LIBCPP_VERSION' \
75 'YES' \ 75 'YES' \
76 '\#endif' \ 76 '\#endif' \
77 | ${CLANGBASE}/bin/clang++ -x c++ -E - 2>&1 \ 77 | ${CLANGBASE}/bin/clang++ -x c++ -E - 2>&1 \
78 | grep YES || true 78 | grep YES || true
79.else 79.else
80LIBCPP_CHECK= NO 80LIBCPP_CHECK= NO
81.endif 81.endif
82 82
83# patch NetBSD::GetCXXStdlibType 83# patch NetBSD::GetCXXStdlibType
84.if ${OPSYS} == "NetBSD" && ${LIBCPP_CHECK} != YES 84.if ${OPSYS} == "NetBSD" && ${LIBCPP_CHECK} != YES