Received: by mail.netbsd.org (Postfix, from userid 605) id 4BA5384EA7; Tue, 5 Mar 2024 16:12:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1709655155; bh=RoSmqufz86kww1MxS6EZE/1yOSjkcF+RV2N7FtpW3Rk=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=Si+R8yO0w+ORCQoRgalM6+9I+e2P7G14UKUzgsQknm3I6aHGPoi6PIp/E3TpTW5no qwjBe9xjOhIr1UPx+Ml+IOmOWiyeyMqoKycyGlYFPjREWP9nUahzNsRPwtYxMo0CXA wNzkIT+T4CIqhK1w0cqXk8HE0iM5vBYwDeSyH3dk= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 37F9684E85 for ; Tue, 5 Mar 2024 16:12:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id j2Q7QFfailHJ for ; Tue, 5 Mar 2024 16:12:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A17CC84E7D for ; Tue, 5 Mar 2024 16:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1709655153; bh=RoSmqufz86kww1MxS6EZE/1yOSjkcF+RV2N7FtpW3Rk=; h=Date:From:Subject:To:Reply-To; b=DWIudnAAp0lsXm88ITmWbwcYyriXpuCvTbD0izYI5az3ENI0Z+oy4iqc1w2PB5jeG 9euL9EltaYXSLIRzKxMmvT3lASPxaxeHYASA2DYww2DHfh6r7XWyF7/ivzRolFXc8T OY12Q5UBvic+avUKhLagazhchS5wlfiwg9ImEmbQ= Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9476BFA29; Tue, 5 Mar 2024 16:12:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1709655153114880" MIME-Version: 1.0 Date: Tue, 5 Mar 2024 16:12:33 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/math/R To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20240305161233.9476BFA29@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1709655153114880 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue Mar 5 16:12:33 UTC 2024 Modified Files: pkgsrc/math/R: distinfo Added Files: pkgsrc/math/R/patches: patch-src_include_R__ext_Error.h Log Message: R: Fix building extensions with C++. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 pkgsrc/math/R/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/math/R/patches/patch-src_include_R__ext_Error.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1709655153114880 Content-Disposition: inline Content-Length: 1998 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/R/distinfo diff -u pkgsrc/math/R/distinfo:1.103 pkgsrc/math/R/distinfo:1.104 --- pkgsrc/math/R/distinfo:1.103 Thu Feb 15 07:48:50 2024 +++ pkgsrc/math/R/distinfo Tue Mar 5 16:12:33 2024 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.103 2024/02/15 07:48:50 markd Exp $ +$NetBSD: distinfo,v 1.104 2024/03/05 16:12:33 jperkin Exp $ BLAKE2s (R-4.3.2.tar.gz) = a79080d65222ec6698175c037390e666385567b1e123acf6ce1e33ee3f122005 SHA512 (R-4.3.2.tar.gz) = 125114357f20d4a3248aee86727768d1dc15e07e44353f8a68fe2ef1fedae508e85d944301d00c0edd61e8b012b0b3cdcde53ac60be903713f96542d83ad5b1d Size (R-4.3.2.tar.gz) = 35039225 bytes SHA1 (patch-configure.ac) = 3cd063c424b7b9674f434d49c771b76dde73ac5c SHA1 (patch-m4_R.m4) = 48a1d38b5505cbb87bd2c156f262680156c07a02 +SHA1 (patch-src_include_R__ext_Error.h) = bc55a8bba6bf931e3f6794577e63bfafdfc740cf SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe SHA1 (patch-src_main_character.c) = c1be2cae404ecbdd547343b70e9d072e9e1d5549 Added files: Index: pkgsrc/math/R/patches/patch-src_include_R__ext_Error.h diff -u /dev/null pkgsrc/math/R/patches/patch-src_include_R__ext_Error.h:1.1 --- /dev/null Tue Mar 5 16:12:33 2024 +++ pkgsrc/math/R/patches/patch-src_include_R__ext_Error.h Tue Mar 5 16:12:33 2024 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_include_R__ext_Error.h,v 1.1 2024/03/05 16:12:33 jperkin Exp $ + +Fix building with C++. + +--- src/include/R_ext/Error.h.orig 2024-03-05 16:09:06.557665563 +0000 ++++ src/include/R_ext/Error.h +@@ -35,7 +35,8 @@ extern "C" { + * In C11 there is _Noreturn * (or noreturn in header ). + */ + #if defined NORET +-#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L) ++#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L) || \ ++ (defined(__cplusplus) && __cplusplus >= 201103L) + # define NORET [[noreturn]] + #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201102L + # define NORET _Noreturn --_----------=_1709655153114880--