Received: by mail.netbsd.org (Postfix, from userid 605) id E8EC984D54; Tue, 27 Dec 2022 10:49:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 20A1C84D4B for ; Tue, 27 Dec 2022 10:49:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id owlAyaqomTGk for ; Tue, 27 Dec 2022 10:49:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 75C6484D31 for ; Tue, 27 Dec 2022 10:49:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 69F26FA90; Tue, 27 Dec 2022 10:49:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1672138182213160" MIME-Version: 1.0 Date: Tue, 27 Dec 2022 10:49:42 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/lang/clang To: pkgsrc-changes@NetBSD.org Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20221227104942.69F26FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1672138182213160 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 pkgsrc/lang/clang/Makefile cvs rdiff -u -r1.78 -r1.79 pkgsrc/lang/clang/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/clang/patches/patch-lib_Interpreter_IncrementalParser.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1672138182213160 Content-Disposition: inline Content-Length: 2888 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/clang/Makefile diff -u pkgsrc/lang/clang/Makefile:1.77 pkgsrc/lang/clang/Makefile:1.78 --- pkgsrc/lang/clang/Makefile:1.77 Thu Dec 1 10:09:02 2022 +++ pkgsrc/lang/clang/Makefile Tue Dec 27 10:49:42 2022 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.77 2022/12/01 10:09:02 adam Exp $ +# $NetBSD: Makefile,v 1.78 2022/12/27 10:49:42 he Exp $ +PKGREVISION= 1 .include "Makefile.common" PKGNAME= ${DISTNAME:S/.src//} Index: pkgsrc/lang/clang/distinfo diff -u pkgsrc/lang/clang/distinfo:1.78 pkgsrc/lang/clang/distinfo:1.79 --- pkgsrc/lang/clang/distinfo:1.78 Thu Dec 1 08:10:52 2022 +++ pkgsrc/lang/clang/distinfo Tue Dec 27 10:49:42 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.78 2022/12/01 08:10:52 wiz Exp $ +$NetBSD: distinfo,v 1.79 2022/12/27 10:49:42 he Exp $ BLAKE2s (clang-15.0.6.src.tar.xz) = 22c571afff6b323ad71fb2e050ff02646a3fa6c093e0b5ca64ef2b6ebf45edd2 SHA512 (clang-15.0.6.src.tar.xz) = 898e9793b27a17689150b8df99fce87037d7353e35b6f03449c64f131a8afb3780e45bf640af8c173362ddbf60bcf09f864a4316b523123899cdd19073ed5e48 @@ -10,6 +10,7 @@ SHA1 (patch-lib_Basic_Targets_OSTargets. SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = ad22a65fb75c266e4f56e3004844f084f92a988f SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3 +SHA1 (patch-lib_Interpreter_IncrementalParser.cpp) = c5ace959ce566478316447b1621e9bfd9a537cc5 SHA1 (patch-lib_Lex_InitHeaderSearch.cpp) = 6f8e3d21efbaf3b90bf6c9859ca703d50fa35a46 SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4 SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525 Added files: Index: pkgsrc/lang/clang/patches/patch-lib_Interpreter_IncrementalParser.cpp diff -u /dev/null pkgsrc/lang/clang/patches/patch-lib_Interpreter_IncrementalParser.cpp:1.1 --- /dev/null Tue Dec 27 10:49:42 2022 +++ pkgsrc/lang/clang/patches/patch-lib_Interpreter_IncrementalParser.cpp Tue Dec 27 10:49:42 2022 @@ -0,0 +1,17 @@ +$NetBSD: patch-lib_Interpreter_IncrementalParser.cpp,v 1.1 2022/12/27 10:49:42 he 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); --_----------=_1672138182213160--