Received: by mail.netbsd.org (Postfix, from userid 605) id D44A684EF1; Sun, 14 Aug 2022 19:54:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 19E2A84D5F for ; Sun, 14 Aug 2022 19:54:32 +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 Z2dHskTBd4_r for ; Sun, 14 Aug 2022 19:54:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8283084D3D for ; Sun, 14 Aug 2022 19:54:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7BEA3FB1A; Sun, 14 Aug 2022 19:54:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1660506871179060" MIME-Version: 1.0 Date: Sun, 14 Aug 2022 19:54:31 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/lang/libcxx To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20220814195431.7BEA3FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1660506871179060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Sun Aug 14 19:54:31 UTC 2022 Modified Files: pkgsrc/lang/libcxx: distinfo Added Files: pkgsrc/lang/libcxx/patches: patch-include_____locale Log Message: libcxx: fix definition of __regex_word on SunOS To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/libcxx/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/lang/libcxx/patches/patch-include_____locale Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1660506871179060 Content-Disposition: inline Content-Length: 2544 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/libcxx/distinfo diff -u pkgsrc/lang/libcxx/distinfo:1.19 pkgsrc/lang/libcxx/distinfo:1.20 --- pkgsrc/lang/libcxx/distinfo:1.19 Sat Aug 13 09:38:09 2022 +++ pkgsrc/lang/libcxx/distinfo Sun Aug 14 19:54:31 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2022/08/13 09:38:09 tnn Exp $ +$NetBSD: distinfo,v 1.20 2022/08/14 19:54:31 tnn Exp $ BLAKE2s (libcxx-14.0.6.src.tar.xz) = e77dfac79fb977adf84345b7e4c2762b3fa89f3d1f611baa8f8fa6831d1bc68a SHA512 (libcxx-14.0.6.src.tar.xz) = c39bb01317e8ae7e5b23a677754a866953b6c45188c194d3d76fbd276de9565df8bcbcab8cf6606584af7dd30a61f39376c0e2de6b8c32c69f7fc592587e710d @@ -10,6 +10,7 @@ BLAKE2s (llvm-14.0.6.src.tar.xz) = 2d449 SHA512 (llvm-14.0.6.src.tar.xz) = 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d Size (llvm-14.0.6.src.tar.xz) = 49660136 bytes SHA1 (patch-include_____config) = 01793dc2ec7db8f51d042fd0114649223036b089 +SHA1 (patch-include_____locale) = 16ce105c26adf43828699ddb2825ea2a199f2bda SHA1 (patch-src_charconv.cpp) = b8569ae77df4a5a7b627b3a9cb6691be73699dca SHA1 (patch-src_filesystem_filesystem__common.h) = 7b088ae8e577b482e05906434b510daed40469ae SHA1 (patch-src_include_to__chars__floating__point.h) = f7f880905609b87830ea657c7510fb3987448a09 Added files: Index: pkgsrc/lang/libcxx/patches/patch-include_____locale diff -u /dev/null pkgsrc/lang/libcxx/patches/patch-include_____locale:1.1 --- /dev/null Sun Aug 14 19:54:31 2022 +++ pkgsrc/lang/libcxx/patches/patch-include_____locale Sun Aug 14 19:54:31 2022 @@ -0,0 +1,24 @@ +$NetBSD: patch-include_____locale,v 1.1 2022/08/14 19:54:31 tnn Exp $ + +Fix definition of __regex_word on SunOS. +0x80 clashes with _ISXDIGIT. Looking at , 0x1000 +/seems/ to be an unused character class so use that pending an +upstream fix. Similar issue to AIX. +See upstream d29c9477320b982b73dc64405ff8f7fc54bb04d6. + +--- include/__locale.orig 2022-06-22 16:46:24.000000000 +0000 ++++ include/__locale +@@ -493,7 +493,13 @@ public: + static const mask punct = _ISPUNCT; + static const mask xdigit = _ISXDIGIT; + static const mask blank = _ISBLANK; ++# if defined(_AIX) ++ static const mask __regex_word = 0x8000; ++# elif defined(__sun__) ++ static const mask __regex_word = 0x1000; ++# else + static const mask __regex_word = 0x80; ++# endif + #elif defined(_NEWLIB_VERSION) + // Same type as Newlib's _ctype_ array in newlib/libc/include/ctype.h. + typedef char mask; --_----------=_1660506871179060--