CVS commit: pkgsrc/math/R

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

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.

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 <stdnoreturn.h>).
+  */
+ #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