pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(math/R) fix make patch stage
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By: mef
Date: Sat Jan 3 09:03:04 2026 +0900
Changeset: c1491a56f2a5ffc4ea31dd7600446ccb49b5a72e
Modified Files:
R/distinfo
R/patches/patch-src_include_R__ext_Error.h
Log Message:
(math/R) fix make patch stage
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c1491a56f2a5ffc4ea31dd7600446ccb49b5a72e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
R/distinfo | 2 +-
R/patches/patch-src_include_R__ext_Error.h | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diffs:
diff --git a/R/distinfo b/R/distinfo
index 81257d3a4b..54d248cc7c 100644
--- a/R/distinfo
+++ b/R/distinfo
@@ -7,6 +7,6 @@ SHA1 (patch-configure.ac) = 41bb6ab2034cbd39c93bbf733097fab21328ba0b
SHA1 (patch-m4_R.m4) = 3e1d390d8aa9895aee7cb479ddab371d82562b88
SHA1 (patch-src_extra_xdr_xdr__mem.c) = 2e607b070db8b24a6ad5501e9c7c1549bf1b1d82
SHA1 (patch-src_extra_xdr_xdr__stdio.c) = e4d8ace08ad282f44113941dd6a3b194769b8167
-SHA1 (patch-src_include_R__ext_Error.h) = bc55a8bba6bf931e3f6794577e63bfafdfc740cf
+SHA1 (patch-src_include_R__ext_Error.h) = fc91727ed68172489667c9b19a8c51f972ed3fd9
SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
SHA1 (patch-src_main_character.c) = c1be2cae404ecbdd547343b70e9d072e9e1d5549
diff --git a/R/patches/patch-src_include_R__ext_Error.h b/R/patches/patch-src_include_R__ext_Error.h
index c679a7be10..27cb58749d 100644
--- a/R/patches/patch-src_include_R__ext_Error.h
+++ b/R/patches/patch-src_include_R__ext_Error.h
@@ -2,14 +2,14 @@ $NetBSD: patch-src_include_R__ext_Error.h,v 1.3 2025/03/02 11:38:51 mef 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" {
+--- src/include/R_ext/Error.h.orig 2025-01-19 08:15:01.000000000 +0900
++++ src/include/R_ext/Error.h 2026-01-03 08:54:10.539893482 +0900
+@@ -45,7 +45,8 @@
* 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) || \
+-#elif (defined(__clang__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L)
++#elif (defined(__clang__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L) || \
+ (defined(__cplusplus) && __cplusplus >= 201103L)
# define NORET [[noreturn]]
#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201102L
Home |
Main Index |
Thread Index |
Old Index