Thu Dec 29 09:05:25 2022 UTC ()
Pullup ticket #6709 - requested by he
lang/clang: NetBSD build fix

Revisions pulled up:
- lang/clang/Makefile                                           1.78
- lang/clang/distinfo                                           1.79
- lang/clang/patches/patch-lib_Interpreter_IncrementalParser.cpp 1.1

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Tue Dec 27 10:49:42 UTC 2022

   Modified Files:
   	pkgsrc/lang/clang: Makefile distinfo
   Added Files:
   	pkgsrc/lang/clang/patches: patch-lib_Interpreter_IncrementalParser.cpp

   Log Message:
   lang/clang: fix build on NetBSD.

   In IncrementalParser.cpp: NetBSD doesn't have ENOTRECOVERABLE, so
   doesn't have std::errc::state_not_recoverable either.  Use
   std::errc::operation_not_supported instead.

   Bump PKGREVISION.


(bsiegert)
diff -r1.77 -r1.77.2.1 pkgsrc/lang/clang/Makefile
diff -r1.78 -r1.78.2.1 pkgsrc/lang/clang/distinfo
diff -r0 -r1.1.2.2 pkgsrc/lang/clang/patches/patch-lib_Interpreter_IncrementalParser.cpp
cvs diff -r1.77 -r1.77.2.1 pkgsrc/lang/clang/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/clang/Makefile 2022/12/01 10:09:02 1.77
+++ pkgsrc/lang/clang/Makefile 2022/12/29 09:05:25 1.77.2.1
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile,v 1.77 2022/12/01 10:09:02 adam Exp $ 1# $NetBSD: Makefile,v 1.77.2.1 2022/12/29 09:05:25 bsiegert Exp $
2 2
 3PKGREVISION= 1
3.include "Makefile.common" 4.include "Makefile.common"
4 5
5PKGNAME= ${DISTNAME:S/.src//} 6PKGNAME= ${DISTNAME:S/.src//}
6 7
7USE_TOOLS+= perl:run 8USE_TOOLS+= perl:run
8 9
9PLIST_VARS+= RISCV 10PLIST_VARS+= RISCV
10.if ${PKG_BUILD_OPTIONS.llvm:Mllvm-target-riscv} 11.if ${PKG_BUILD_OPTIONS.llvm:Mllvm-target-riscv}
11PLIST.RISCV= yes 12PLIST.RISCV= yes
12.endif 13.endif
13 14
14PLIST_VARS+= ARM 15PLIST_VARS+= ARM
15.if ${PKG_BUILD_OPTIONS.llvm:Mllvm-target-arm} || \ 16.if ${PKG_BUILD_OPTIONS.llvm:Mllvm-target-arm} || \
cvs diff -r1.78 -r1.78.2.1 pkgsrc/lang/clang/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/clang/distinfo 2022/12/01 08:10:52 1.78
+++ pkgsrc/lang/clang/distinfo 2022/12/29 09:05:25 1.78.2.1
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.78 2022/12/01 08:10:52 wiz Exp $ 1$NetBSD: distinfo,v 1.78.2.1 2022/12/29 09:05:25 bsiegert Exp $
2 2
3BLAKE2s (clang-15.0.6.src.tar.xz) = 22c571afff6b323ad71fb2e050ff02646a3fa6c093e0b5ca64ef2b6ebf45edd2 3BLAKE2s (clang-15.0.6.src.tar.xz) = 22c571afff6b323ad71fb2e050ff02646a3fa6c093e0b5ca64ef2b6ebf45edd2
4SHA512 (clang-15.0.6.src.tar.xz) = 898e9793b27a17689150b8df99fce87037d7353e35b6f03449c64f131a8afb3780e45bf640af8c173362ddbf60bcf09f864a4316b523123899cdd19073ed5e48 4SHA512 (clang-15.0.6.src.tar.xz) = 898e9793b27a17689150b8df99fce87037d7353e35b6f03449c64f131a8afb3780e45bf640af8c173362ddbf60bcf09f864a4316b523123899cdd19073ed5e48
5Size (clang-15.0.6.src.tar.xz) = 18838320 bytes 5Size (clang-15.0.6.src.tar.xz) = 18838320 bytes
6BLAKE2s (cmake-15.0.6.src.tar.xz) = 6d91c537ea78e56d2621d703d6d20d9b4f52281b80520e5003bb8ea402ad8236 6BLAKE2s (cmake-15.0.6.src.tar.xz) = 6d91c537ea78e56d2621d703d6d20d9b4f52281b80520e5003bb8ea402ad8236
7SHA512 (cmake-15.0.6.src.tar.xz) = a078b9b426515414dae41c8732d7cd955e8ddc9638b4ba9c7dd0925db68e5ea760096f08fd7e1cb9d55b6d73da75f9b4318a2fac36d7aa64f47536ac383b3edc 7SHA512 (cmake-15.0.6.src.tar.xz) = a078b9b426515414dae41c8732d7cd955e8ddc9638b4ba9c7dd0925db68e5ea760096f08fd7e1cb9d55b6d73da75f9b4318a2fac36d7aa64f47536ac383b3edc
8Size (cmake-15.0.6.src.tar.xz) = 6972 bytes 8Size (cmake-15.0.6.src.tar.xz) = 6972 bytes
9SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99 9SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99
10SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e 10SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
11SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = ad22a65fb75c266e4f56e3004844f084f92a988f 11SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = ad22a65fb75c266e4f56e3004844f084f92a988f
12SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3 12SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3
 13SHA1 (patch-lib_Interpreter_IncrementalParser.cpp) = c5ace959ce566478316447b1621e9bfd9a537cc5
13SHA1 (patch-lib_Lex_InitHeaderSearch.cpp) = 6f8e3d21efbaf3b90bf6c9859ca703d50fa35a46 14SHA1 (patch-lib_Lex_InitHeaderSearch.cpp) = 6f8e3d21efbaf3b90bf6c9859ca703d50fa35a46
14SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4 15SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4
15SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525 16SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525
File Added: pkgsrc/lang/clang/patches/patch-lib_Interpreter_IncrementalParser.cpp
$NetBSD: patch-lib_Interpreter_IncrementalParser.cpp,v 1.1.2.2 2022/12/29 09:05:25 bsiegert Exp $

NetBSD doesn't have ENOTRECOVERABLE, so doesn't have
std::errc::state_not_recoverable either.  Use
std::errc::operation_not_supported instead.

--- lib/Interpreter/IncrementalParser.cpp.orig	2022-11-16 06:28:29.000000000 +0000
+++ lib/Interpreter/IncrementalParser.cpp
@@ -53,7 +53,7 @@ public:
           switch (CI.getFrontendOpts().ProgramAction) {
           default:
             Err = llvm::createStringError(
-                std::errc::state_not_recoverable,
+                std::errc::operation_not_supported,
                 "Driver initialization failed. "
                 "Incremental mode for action %d is not supported",
                 CI.getFrontendOpts().ProgramAction);