<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fca8e4f0a1d9be6c899cdeffa3f03f9c8ebe63bb">https://github.com/macports/macports-ports/commit/fca8e4f0a1d9be6c899cdeffa3f03f9c8ebe63bb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fca8e4f0a1d9be6c899cdeffa3f03f9c8ebe63bb
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sun Apr 30 19:30:19 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> ruby30: update to 3.0.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See:
</span><span style='display:block; white-space:pre;color:#404040;'> https://www.ruby-lang.org/en/news/2023/03/30/ruby-3-0-6-released/
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also converts the former reinplace-based patch for 'gem' versioning to
</span><span style='display:block; white-space:pre;color:#404040;'> a normal patch, as previously recommended.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built successfully -universal on OSX 10.4-10.5 ppc, 10.4-10.6 i386,
</span><span style='display:block; white-space:pre;color:#404040;'> 10.5-10.15 x86_64, and 11.x-13.x arm64. Also successfully built
</span><span style='display:block; white-space:pre;color:#404040;'> +universal in all 10.6+ cases except 10.14-10.15 (SDK restriction),
</span><span style='display:block; white-space:pre;color:#404040;'> and build all variants for 10.9 and 11.x-13.x arm64. 10.4 and 10.5
</span><span style='display:block; white-space:pre;color:#404040;'> currently have dependency/compiler issues for +universal.
</span>---
lang/ruby30/Portfile | 41 +++++++++--------------
lang/ruby30/files/patch-generated.diff | 10 +++---
lang/ruby30/files/patch-sources.diff | 61 ++++++++++++++++++++--------------
3 files changed, 56 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby30/Portfile b/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ceb7e24a045..a37302f0c16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup openssl 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name ruby30
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,11 +29,11 @@ master_sites ruby:3.0
</span> distname ruby-${version}
dist_subdir ruby30
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 cdff2395625dc1d632fc5400c8fec103 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f9b5ccef8f9226c3e8e3b84c9b186b5699d5392b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 95e69c79c0cf173f87727b76994ddf0725d5fafc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21312118
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 6b5a7b14505697e6fc2b40b345679f40 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ee1791f690e0ef33518d590f85eb33b417590f75 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 1052441f0abbb0302fb9f1481d2db99dfb4d4c29 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21315725
</span>
# ruby/openssl does not support openssl-3
openssl.branch 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,12 +53,10 @@ select.file ${filespath}/ruby30
</span> # Patches derived from MacPorts-enhanced GitHub fork at
# github.com/fhgwright/ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-sources.diff: fixes for build problems on 10.4 and 10.5.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Also, since the previous patch-random.c.diff (fix for 10.7 build error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# wasn't renormalized for 3.0.5, it has been folded into this diff, rather
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# than being retained as is.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch-sources.diff: fixes for various issues.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This includes the 'gem' versioning fix formerly handled via reinplace.
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from v3_0_5 vs. macports-3_0_5r1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v3_0_6 vs. macports-3_0_6.
</span> #
patchfiles-append patch-sources.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,16 +65,11 @@ patchfiles-append patch-sources.diff
</span> # source patches so that make doesn't regard them as outdated.
# At present, the only patched generated file is 'configure', to avoid
# the need to rerun autoconf, whose output has reproducibility issues.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from tarball-3_0_5 vs. macports-tarball-3_0_5r1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from tarball-3_0_6 vs. macports-tarball-3_0_6.
</span> #
patchfiles-append patch-generated.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# It's recommended that the reinplace patch be folded into the combined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# source patch in a future update (the fork already has a commit for it).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Using a patch instead of reinplace for the 'gem' versioning fix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# would be more readable and more trackable. A commit version of this already
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# exists in the fork, in the macports-reinplace-3_0 branch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #-------------------------------------------------------------------------------
# Fix compilation on buildbots for 10.12 and earlier.
# Issue: 62183: error: use of undeclared identifier 'fmt'; did you mean 'fma'?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,18 +136,14 @@ if {[info exists build_arch] && ${build_arch} != ""} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # rewrite "gem" to "gem3.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # def gem_command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ENV["GEM_COMMAND"]&.shellsplit || ["gem"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s/(shellsplit .. .)(\"gem\")/\\1\"gem3.0\"/g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lib/bundler/gem_helper.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Ensure that generated files have clearly later mtimes than sources,
# to avoid gratuitous rebuilds by make.
# This is already nominally true based on the patching order, but
# one-second resolution on timestamps may cover it up.
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The list of files here should match the list of files patched by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch-generated.diff.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span> # Increment the mtime(s) by one second.
foreach genfile [list configure] {
set genfull ${worksrcpath}/${genfile}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby30/files/patch-generated.diff b/lang/ruby30/files/patch-generated.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9539649fb20..a92085292b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby30/files/patch-generated.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby30/files/patch-generated.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2022-11-24 03:04:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-01-18 14:26:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9237,6 +9237,8 @@ case "$target_archs" in #(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-03-30 05:41:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-04-24 17:03:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9272,6 +9272,8 @@ case "$target_archs" in #(
</span> ARCH_FLAG=-m64 ;; #(
i[3-6]86) :
ARCH_FLAG=-m32 ;; #(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> *) :
as_fn_error $? "unknown target architecture: $target_archs" "$LINENO" 5
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9335,6 +9337,8 @@ case "$target_cpu" in #(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9370,6 +9372,8 @@ case "$target_cpu" in #(
</span> ARCH_FLAG=-m64 ;; #(
i[3-6]86) :
ARCH_FLAG=-m32 ;; #(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> *) :
as_fn_error $? "unknown target architecture: $target_archs" "$LINENO" 5
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28712,6 +28716,18 @@ printf %s "checking native coroutine imp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28747,6 +28751,18 @@ printf %s "checking native coroutine imp
</span>
rb_cv_coroutine=arm64
;; #(
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby30/files/patch-sources.diff b/lang/ruby30/files/patch-sources.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d9fc6f71ec7..d012f3e9a04 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby30/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby30/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .gdbinit.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .gdbinit 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .gdbinit.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .gdbinit 2023-04-24 17:03:36.000000000 -0700
</span> @@ -1,4 +1,5 @@
-set startup-with-shell off
+# Move this to end, so failure on older gdbs doesn't blow the rest
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,9 +14,9 @@
</span> +
+# Moved from beginning, since it fails on older gdbs
+set startup-with-shell off
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2433,6 +2433,15 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2023-04-24 17:03:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2441,6 +2441,15 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
</span> [arm64-darwin*], [
rb_cv_coroutine=arm64
],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +32,8 @@
</span> [x*64-linux*], [
AS_CASE(["$ac_cv_sizeof_voidp"],
[8], [ rb_cv_coroutine=amd64 ],
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- dln.c.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dln.c 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dln.c.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dln.c 2023-04-24 17:03:36.000000000 -0700
</span> @@ -1350,8 +1350,7 @@ dln_load(const char *file)
if (dln_incompatible_library_p(handle)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +44,8 @@
</span> /* dlclose() segfaults */
rb_fatal("%s - %s", incompatible, file);
# else
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- error.c.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ error.c 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- error.c.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ error.c 2023-04-24 17:03:36.000000000 -0700
</span> @@ -649,7 +649,7 @@ preface_dump(FILE *out)
"-- Crash Report log information "
"--------------------------------------------\n"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,8 +64,8 @@
</span> "CrashReporter or "
# endif
"DiagnosticReports directory in bug reports.\n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- file.c.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ file.c 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- file.c.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ file.c 2023-04-24 17:03:36.000000000 -0700
</span> @@ -152,6 +152,23 @@ int flock(int, int);
# include <stdlib.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,8 +100,8 @@
</span> /* glibc realpath(3) does not allow /path/to/file.rb/../other_file.rb,
returning ENOTDIR in that case.
glibc realpath(3) can also return ENOENT for paths that exist,
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- io.c.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ io.c 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- io.c.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ io.c 2023-04-24 17:03:36.000000000 -0700
</span> @@ -114,6 +114,15 @@
# include <copyfile.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,8 +118,19 @@
</span> #include "ruby/internal/stdbool.h"
#include "ccan/list/list.h"
#include "dln.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- random.c.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ random.c 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/bundler/gem_helper.rb.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/bundler/gem_helper.rb 2023-04-24 17:03:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -232,7 +232,7 @@ module Bundler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def gem_command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENV["GEM_COMMAND"]&.shellsplit || ["gem"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENV["GEM_COMMAND"]&.shellsplit || ["gem3.0"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- random.c.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ random.c 2023-04-24 17:03:36.000000000 -0700
</span> @@ -474,7 +474,16 @@ fill_random_bytes_urandom(void *seed, si
#if 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,8 +149,8 @@
</span>
static int
fill_random_bytes_syscall(void *seed, size_t size, int unused)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- signal.c.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ signal.c 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2023-04-24 17:03:36.000000000 -0700
</span> @@ -841,7 +841,8 @@ check_stack_overflow(int sig, const uint
const greg_t bp = mctx->gregs[REG_EBP];
# endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,8 +161,8 @@
</span> # define MCTX_SS_REG(reg) __ss.__##reg
# else
# define MCTX_SS_REG(reg) ss.reg
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- template/Makefile.in.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ template/Makefile.in 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- template/Makefile.in.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ template/Makefile.in 2023-04-24 17:03:36.000000000 -0700
</span> @@ -214,7 +214,7 @@ AR = @AR@
ARFLAGS = @ARFLAGS@$(empty)
RANLIB = @RANLIB@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,8 +172,8 @@
</span> IFCHANGE = $(tooldir)/ifchange
OBJDUMP = @OBJDUMP@
OBJCOPY = @OBJCOPY@
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tool/m4/ruby_default_arch.m4.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tool/m4/ruby_default_arch.m4 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tool/m4/ruby_default_arch.m4.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tool/m4/ruby_default_arch.m4 2023-04-24 17:03:36.000000000 -0700
</span> @@ -4,6 +4,7 @@ AC_MSG_CHECKING([arch option])
AS_CASE([$1],
[*64], [ARCH_FLAG=-m64],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,8 +182,8 @@
</span> [AC_MSG_ERROR(unknown target architecture: $target_archs)]
)
AC_MSG_RESULT([$ARCH_FLAG])
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tool/transform_mjit_header.rb.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tool/transform_mjit_header.rb 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tool/transform_mjit_header.rb.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tool/transform_mjit_header.rb 2023-04-24 17:03:36.000000000 -0700
</span> @@ -184,7 +184,9 @@ module MJITHeader
def self.conflicting_types?(code, cc, cflags)
with_code(code) do |path|
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,8 +195,8 @@
</span> !$?.success? &&
(out.match?(/error: conflicting types for '[^']+'/) ||
out.match?(/error: redefinition of parameter '[^']+'/))
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- vm_dump.c.orig 2022-11-24 03:04:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm_dump.c 2023-01-18 14:26:47.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_dump.c.orig 2023-03-30 05:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2023-04-24 17:03:36.000000000 -0700
</span> @@ -462,7 +462,8 @@ rb_vmdebug_thread_dump_state(VALUE self)
}
</pre><pre style='margin:0'>
</pre>