Sat Aug 13 09:58:04 2022 UTC ()
clang: de-lint, repair broken patch distinfo, restore SunOS patch. Untested


(tnn)
diff -r1.72 -r1.73 pkgsrc/lang/clang/Makefile
diff -r1.50 -r1.51 pkgsrc/lang/clang/Makefile.common
diff -r1.74 -r1.75 pkgsrc/lang/clang/distinfo
diff -r1.18 -r1.19 pkgsrc/lang/clang-tools-extra/Makefile
diff -r1.2 -r0 pkgsrc/lang/clang/patches/patch-lib_Frontend_InitHeaderSearch.cpp
diff -r0 -r1.1 pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp
cvs diff -r1.72 -r1.73 pkgsrc/lang/clang/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/clang/Makefile 2022/08/12 19:03:39 1.72
+++ pkgsrc/lang/clang/Makefile 2022/08/13 09:58:03 1.73
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.72 2022/08/12 19:03:39 tnn Exp $ 1# $NetBSD: Makefile,v 1.73 2022/08/13 09:58:03 tnn Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/.src//} 5PKGNAME= ${DISTNAME:S/.src//}
6 6
7USE_TOOLS+= perl:run 7USE_TOOLS+= perl:run
8 8
9PLIST_VARS+= RISCV 9PLIST_VARS+= RISCV
10.if !empty(PKG_BUILD_OPTIONS.llvm:Mllvm-target-riscv) 10.if ${PKG_BUILD_OPTIONS.llvm:Mllvm-target-riscv}
11PLIST.RISCV= yes 11PLIST.RISCV= yes
12.endif 12.endif
13 13
14.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.50 -r1.51 pkgsrc/lang/clang/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/clang/Makefile.common 2022/08/12 08:45:44 1.50
+++ pkgsrc/lang/clang/Makefile.common 2022/08/13 09:58:03 1.51
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile.common,v 1.50 2022/08/12 08:45:44 pin Exp $ 1# $NetBSD: Makefile.common,v 1.51 2022/08/13 09:58:03 tnn 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
15CONFIGURE_DIRS= ${WRKDIR}/build 15CONFIGURE_DIRS= build
16CMAKE_ARG_PATH= ${WRKSRC} 16CMAKE_ARG_PATH= ${WRKSRC}
17 17
18USE_LANGUAGES= c c++14 18USE_LANGUAGES= c c++14
19USE_CMAKE= yes 19USE_CMAKE= yes
20GCC_REQD+= 5 20GCC_REQD+= 5
21 21
22CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q} 22CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
23CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 23CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
24CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q} 24CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
25CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q} 25CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
26 26
27.include "../../mk/compiler.mk" 27.include "../../mk/compiler.mk"
28 28
@@ -137,37 +137,37 @@ PLIST.notdylib= yes @@ -137,37 +137,37 @@ PLIST.notdylib= yes
137.endif 137.endif
138PLIST_SUBST+= SOEXT=${SOEXT} 138PLIST_SUBST+= SOEXT=${SOEXT}
139 139
140PKG_OPTIONS_VAR= PKG_OPTIONS.clang 140PKG_OPTIONS_VAR= PKG_OPTIONS.clang
141PKG_SUPPORTED_OPTIONS= tests z3 141PKG_SUPPORTED_OPTIONS= tests z3
142 142
143.include "../../mk/bsd.options.mk" 143.include "../../mk/bsd.options.mk"
144 144
145.if !empty(PKG_OPTIONS:Mtests) 145.if !empty(PKG_OPTIONS:Mtests)
146CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON 146CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
147CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=ON 147CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=ON
148TEST_TARGET= clang-test 148TEST_TARGET= clang-test
149TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib 149TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
150.include "../../devel/googletest/buildlink3.mk" 150. include "../../devel/googletest/buildlink3.mk"
151.else 151.else
152CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF 152CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
153CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=OFF 153CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=OFF
154.endif 154.endif
155 155
156.include "../../lang/llvm/buildlink3.mk" 156.include "../../lang/llvm/buildlink3.mk"
157 157
158.if !empty(PKG_OPTIONS:Mz3) 158.if !empty(PKG_OPTIONS:Mz3)
159.if empty(PKG_BUILD_OPTIONS.llvm:Mz3) 159. if empty(PKG_BUILD_OPTIONS.llvm:Mz3)
160PKG_FAIL_REASON+= "z3 PKG_OPTION must be enabled in lang/llvm" 160PKG_FAIL_REASON+= "z3 PKG_OPTION must be enabled in lang/llvm"
161.endif 161. endif
162.include "../../math/z3/buildlink3.mk" 162. include "../../math/z3/buildlink3.mk"
163CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON 163CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=ON
164.endif 164.endif
165 165
166post-extract: 166post-extract:
167 ${MKDIR} ${WRKDIR}/build 167 ${MKDIR} ${WRKSRC}/build
168 168
169.include "../../textproc/libxml2/buildlink3.mk" 169.include "../../textproc/libxml2/buildlink3.mk"
170.include "../../devel/zlib/buildlink3.mk" 170.include "../../devel/zlib/buildlink3.mk"
171.include "../../lang/python/application.mk" 171.include "../../lang/python/application.mk"
172.include "../../lang/python/tool.mk" 172.include "../../lang/python/tool.mk"
173DEPENDS+= llvm-${PKGVERSION_NOREV}{,nb*}:../../lang/llvm 173DEPENDS+= llvm-${PKGVERSION_NOREV}{,nb*}:../../lang/llvm
cvs diff -r1.74 -r1.75 pkgsrc/lang/clang/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/clang/distinfo 2022/08/12 08:45:44 1.74
+++ pkgsrc/lang/clang/distinfo 2022/08/13 09:58:03 1.75
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.74 2022/08/12 08:45:44 pin Exp $ 1$NetBSD: distinfo,v 1.75 2022/08/13 09:58:03 tnn Exp $
2 2
3BLAKE2s (clang-14.0.6.src.tar.xz) = a39d30a3475f93605cf5cf63374500d78b1583e5c738b3ad7693a9ef08c137c4 3BLAKE2s (clang-14.0.6.src.tar.xz) = a39d30a3475f93605cf5cf63374500d78b1583e5c738b3ad7693a9ef08c137c4
4SHA512 (clang-14.0.6.src.tar.xz) = 5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b 4SHA512 (clang-14.0.6.src.tar.xz) = 5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b
5Size (clang-14.0.6.src.tar.xz) = 18539496 bytes 5Size (clang-14.0.6.src.tar.xz) = 18539496 bytes
6SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99 6SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99
7SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e 7SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
8SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 29e6ca7cf0bf0b01f50305f50cd555cbb75995e1 8SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 29e6ca7cf0bf0b01f50305f50cd555cbb75995e1
9SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3 9SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3
 10SHA1 (patch-lib_Lex_InitHeaderSearch.cpp) = e5cd01d0950f2d9f29b295b2c6da42ec73ce81ca
10SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4 11SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4
11SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525 12SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525
cvs diff -r1.18 -r1.19 pkgsrc/lang/clang-tools-extra/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/clang-tools-extra/Makefile 2022/08/12 08:50:58 1.18
+++ pkgsrc/lang/clang-tools-extra/Makefile 2022/08/13 09:58:04 1.19
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.18 2022/08/12 08:50:58 pin Exp $ 1# $NetBSD: Makefile,v 1.19 2022/08/13 09:58:04 tnn Exp $
2 2
3.include "../../lang/clang/Makefile.common" 3.include "../../lang/clang/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/clang/clang-tools-extra/:S/.src//} 5PKGNAME= ${DISTNAME:S/clang/clang-tools-extra/:S/.src//}
6 6
7COMMENT= Extra Clang tools 7COMMENT= Extra Clang tools
8 8
9DEPENDS+= clang>=${LLVM_VERSION}:../../lang/clang 9DEPENDS+= clang>=${LLVM_VERSION}:../../lang/clang
10 10
11_EXTRA_DIST= ${DISTNAME:S/clang/clang-tools-extra/}${EXTRACT_SUFX} 11EXTRA_DIST= ${DISTNAME:S/clang/clang-tools-extra/}${EXTRACT_SUFX}
12SITES.${_EXTRA_DIST}= ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/} 12SITES.${EXTRA_DIST}= ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
13 13
14DISTFILES= ${DEFAULT_DISTFILES} ${_EXTRA_DIST} 14DISTFILES= ${DEFAULT_DISTFILES} ${EXTRA_DIST}
15 15
16BUILD_TARGET= clang-change-namespace clang-apply-replacements clang-doc 16BUILD_TARGET= clang-change-namespace clang-apply-replacements clang-doc
17BUILD_TARGET+= clang-include-fixer clang-move clang-query clang-reorder-fields 17BUILD_TARGET+= clang-include-fixer clang-move clang-query clang-reorder-fields
18BUILD_TARGET+= clang-tidy clangd modularize pp-trace tool-template 18BUILD_TARGET+= clang-tidy clangd modularize pp-trace tool-template
19INSTALL_DIRS= ../build/tools/extra 19INSTALL_DIRS= build/tools/extra
20 20
21REPLACE_PYTHON+= tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py 21REPLACE_PYTHON+= tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
22REPLACE_PYTHON+= tools/extra/clang-tidy/tool/clang-tidy-diff.py 22REPLACE_PYTHON+= tools/extra/clang-tidy/tool/clang-tidy-diff.py
23REPLACE_PYTHON+= tools/extra/clang-tidy/tool/run-clang-tidy.py 23REPLACE_PYTHON+= tools/extra/clang-tidy/tool/run-clang-tidy.py
24 24
25BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-Bsymbolic-functions 25BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-Bsymbolic-functions
26 26
27.PHONY: inject-clang-tools 27.PHONY: inject-clang-tools
28post-extract: inject-clang-tools 28post-extract: inject-clang-tools
29inject-clang-tools: 29inject-clang-tools:
30 ${MV} ${WRKDIR}/${DISTNAME:S/clang/clang-tools-extra/} ${WRKSRC}/tools/extra 30 ${MV} ${WRKDIR}/${DISTNAME:S/clang/clang-tools-extra/} ${WRKSRC}/tools/extra
31 31
32.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/lang/clang/patches/Attic/patch-lib_Frontend_InitHeaderSearch.cpp
File Added: pkgsrc/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp
$NetBSD: patch-lib_Lex_InitHeaderSearch.cpp,v 1.1 2022/08/13 09:58:04 tnn Exp $

Don't add /usr/local/include by default on Solaris.
was: patch-lib_Frontend_InitHeaderSearch.cpp

--- lib/Lex/InitHeaderSearch.cpp.orig	2022-06-22 16:46:24.000000000 +0000
+++ lib/Lex/InitHeaderSearch.cpp
@@ -241,6 +241,7 @@ void InitHeaderSearch::AddDefaultCInclud
     case llvm::Triple::PS4:
     case llvm::Triple::ELFIAMCU:
     case llvm::Triple::Fuchsia:
+    case llvm::Triple::Solaris:
       break;
     case llvm::Triple::Win32:
       if (triple.getEnvironment() != llvm::Triple::Cygnus)