<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/32ba7b9f9121ecb1838ed2090ffb9e3f408a5cc3">https://github.com/macports/macports-ports/commit/32ba7b9f9121ecb1838ed2090ffb9e3f408a5cc3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 32ba7b9f912 ruby26: Fix build on macOS 12+, plus cleanups.
</span>32ba7b9f912 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 32ba7b9f9121ecb1838ed2090ffb9e3f408a5cc3
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Fri Jan 27 14:14:03 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> ruby26: Fix build on macOS 12+, plus cleanups.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Note that building for macOS 12.x previously worked before upgrading
</span><span style='display:block; white-space:pre;color:#404040;'> to Xcode 14. Building for macOS 13.x never worked.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Cherry-picks upstream change to fix Xcode 14+ build for macOS 12+.
</span><span style='display:block; white-space:pre;color:#404040;'> This changes content even on working builds, hence the revbump.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes issue with building bigdecimal with Xcode 14+ for macOS 12+, by
</span><span style='display:block; white-space:pre;color:#404040;'> disabling chained fixups and allowing the needed linker option. See
</span><span style='display:block; white-space:pre;color:#404040;'> the commit in the fork for more details.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Replaces ugly Portfile hacks for 10.5 x86_64 with proper fixes
</span><span style='display:block; white-space:pre;color:#404040;'> developed for ruby27.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Replaces topical patchfiles with consolidated patchfiles derived
</span><span style='display:block; white-space:pre;color:#404040;'> from the GitHub fork at fhgwright/ruby.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes a couple of typos in a Portfile comment.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also adds self as co-maintainer.
</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 on OSX 10.4-10.5 ppc, 10.4-10.6 i386, 10.5-10.15 x86_64, and
</span><span style='display:block; white-space:pre;color:#404040;'> 11.x-13.x arm64, including universal builds for all but 10.4, where
</span><span style='display:block; white-space:pre;color:#404040;'> dependency issues prevent building. Also tested all variants in a
</span><span style='display:block; white-space:pre;color:#404040;'> subset of cases.
</span>---
lang/ruby26/Portfile | 73 ++++----
lang/ruby26/files/patch-c99check.diff | 13 --
lang/ruby26/files/patch-configure_cxx11.diff | 16 --
.../ruby26/files/patch-ext-openssl-extconf.rb.diff | 13 --
lang/ruby26/files/patch-generated.diff | 32 ++++
lang/ruby26/files/patch-osversions.diff | 32 ----
lang/ruby26/files/patch-ruby_issue_17777.diff | 11 --
lang/ruby26/files/patch-sources.diff | 192 +++++++++++++++++++++
lang/ruby26/files/patch-test-fiddle-helper.rb.diff | 16 --
lang/ruby26/files/patch-tiger.diff | 24 ---
10 files changed, 259 insertions(+), 163 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/Portfile b/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 550e62e52f6..bb65146b29b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,10 +10,12 @@ deprecated.upstream_support no
</span>
name ruby26
version 2.6.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories lang ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {kimuraw @kimuraw} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {kimuraw @kimuraw} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {fwright.net:fw @fhgwright} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span> platforms darwin
description Powerful and clean object-oriented scripting language
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,33 +66,32 @@ configure.args --enable-shared \
</span> --with-openssl-include=[openssl::include_dir] \
--with-openssl-lib=[openssl::lib_dir]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-configure_cxx11.diff: fix "invalid suffix on literal" with C++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# from RUBY_ARCH and RUBY_PLATFORM in config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/58255
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note that this patches the output of autoconf, rather than the input, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# at present, rerunning autonconf produces a broken configure.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix test failure at ext/fiddle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-test-fiddle-helper.rb.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# avoid build error with apple clang 12 (implicit declaration of function)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugs.ruby-lang.org/issues/17777
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-ruby_issue_17777.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix build on 10.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-tiger.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix build on < 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-osversions.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix build with pre-C99 compilers and some locale settings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-c99check.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix ext/openssl uses wrong pkgconfig (#63845)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-ext-openssl-extconf.rb.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patches derived from MacPorts-enhanced GitHub fork at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# github.com/fhgwright/ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# These replace and enhance the former topic-specific patches, which can be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# seen more readably in the fork.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch-sources.diff: fixes for various build problems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v2_6_10 vs. macports-2_6_10r1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch-generated.diff: additional patches to generated files, which don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# exist in the upstream git sources, and which must be patched after the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# source patches so that make doesn't regard them as outdated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# At present, the only patched generated file is 'configure', to avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the need to rerun autoconf, whose output has reproducibility issues.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from tarball-2_6_10 vs. macports-tarball-2_6_10r1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-generated.diff
</span>
# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
# (see ruby27)
post-build {
if {${os.major} >= 20} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ruby saves its' compile options (CFLAGS, LDFLAGS, ..) in "rbconfig.rb" at build,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and uses the options when complile binary extensions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ruby saves its compile options (CFLAGS, LDFLAGS, ..) in "rbconfig.rb" at build,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and uses the options when compiling binary extensions.
</span>
# rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,6 +113,17 @@ post-patch {
</span> # (see rb-bundler) sh "gem build ..." -> sh "gem2.6 build ..."
reinplace -E "s/(gem) (build|install|push)/gem2.6 \\2/g" \
${worksrcpath}/lib/bundler/gem_helper.rb
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure that generated files have clearly later mtimes than sources,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to avoid gratuitous rebuilds by make.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is already nominally true based on the patching order, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # one-second resolution on timestamps may cover it up.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Increment the mtime(s) by one second.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach genfile [list configure] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set genfull ${worksrcpath}/${genfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mtime ${genfull} [expr [file mtime ${genfull}] + 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,21 +203,6 @@ platform darwin {
</span> configure.cflags-append -std=c99
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode gcc 4.2 building x86_64 assembler code passes "-arch i386" to the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # assembler, breaking x86_64 builds, unless we override it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match *gcc-4.2 ${configure.compiler}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && "x86_64" in [get_canonical_archs]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append ASFLAGS=[get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Building for 10.5 x86_64 fails if libunwind-headers is active.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # It's unknown why only this one case fails.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 9 && "x86_64" in [get_canonical_archs]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build-append libunwind-headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${os.major} == 8} {
configure.cppflags-append -DCPU_SUBTYPE_MASK=0xff000000
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/files/patch-c99check.diff b/lang/ruby26/files/patch-c99check.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 20feab7766c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/files/patch-c99check.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tool/transform_mjit_header.rb.orig 2021-07-07 03:38:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tool/transform_mjit_header.rb 2021-08-17 16:03:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,7 +176,9 @@ module MJITHeader
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def self.conflicting_types?(code, cc, cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with_code(code) do |path|
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmd = "#{cc} #{cflags} #{path}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- out = IO.popen(cmd, err: [:child, :out], &:read)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # As per gcc docs, set LC_ALL=C to avoid curly quotes in messages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cmd_env = {"LC_ALL" => "C"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out = IO.popen(cmd_env, cmd, err: [:child, :out], &:read)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !$?.success? &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (out.match?(/error: conflicting types for '[^']+'/) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- out.match?(/error: redefinition of parameter '[^']+'/))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/files/patch-configure_cxx11.diff b/lang/ruby26/files/patch-configure_cxx11.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 29ffa58f534..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/files/patch-configure_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-03-31 20:23:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-12-30 08:41:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29570,11 +29570,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define RUBY_ARCH "universal-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define RUBY_ARCH "universal-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/files/patch-ext-openssl-extconf.rb.diff b/lang/ruby26/files/patch-ext-openssl-extconf.rb.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 90510ec1689..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/files/patch-ext-openssl-extconf.rb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/openssl/extconf.rb.orig 2021-07-07 19:38:58.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/openssl/extconf.rb 2021-11-08 22:10:21.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Logging::message "=== Checking for required stuff... ===\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--result = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# mkmf#pkg_config() looks to ignore PKG_CONFIG_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#result = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+result = nil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def find_openssl_library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if $mswin || $mingw
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/files/patch-generated.diff b/lang/ruby26/files/patch-generated.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dadaffc66fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby26/files/patch-generated.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-04-12 04:50:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-01-26 16:33:49.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26922,7 +26922,15 @@ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$target_os" in #(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin*) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # The -no_fixup_chains is needed on macOS 12+ to avoid getting a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # warning on the -undefined dynamic_lookup, which in turn disables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # the latter here and breaks the build of ext/bigdecimal/util.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Since options aren't cumulative here, the two options need to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # tested together. Older linkers may not support the added option,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # so we then try the original option alone. This may result in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # a harmless duplicate.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for flag in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-undefined dynamic_lookup -no_fixup_chains" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-undefined dynamic_lookup" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-multiply_defined suppress" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29651,11 +29659,11 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_ARCH "universal-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_ARCH "universal-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define RUBY_PLATFORM "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define RUBY_PLATFORM "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/files/patch-osversions.diff b/lang/ruby26/files/patch-osversions.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7750a85a75a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/files/patch-osversions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./dln.c.orig 2021-07-07 03:38:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./dln.c 2021-08-17 19:39:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1347,8 +1347,7 @@ dln_load(const char *file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (dln_incompatible_library_p(handle)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if defined __APPLE__ && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* dlclose() segfaults */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rb_fatal("%s - %s", incompatible, file);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./error.c.orig 2021-07-07 03:38:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./error.c 2021-08-17 19:39:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -478,7 +478,7 @@ preface_dump(FILE *out)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-- Crash Report log information "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "--------------------------------------------\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " See Crash Report log file under the one of following:\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " * ~/Library/Logs/CrashReporter\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " * /Library/Logs/CrashReporter\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -503,7 +503,7 @@ postscript_dump(FILE *out)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "[IMPORTANT]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*" ------------------------------------------------"*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "\n""Don't forget to include the Crash Report log file under\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CrashReporter or "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "DiagnosticReports directory in bug reports.\n"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/files/patch-ruby_issue_17777.diff b/lang/ruby26/files/patch-ruby_issue_17777.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 396225948e2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/files/patch-ruby_issue_17777.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vm.c.orig 2021-04-05 20:48:34.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm.c 2021-04-11 18:30:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,6 +27,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "probes_helper.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALUE rb_str_concat_literals(size_t, const VALUE*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* https://bugs.ruby-lang.org/issues/17777 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void rb_native_mutex_destroy(rb_nativethread_lock_t *lock);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PUREFUNC(static inline const VALUE *VM_EP_LEP(const VALUE *));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static inline const VALUE *
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/files/patch-sources.diff b/lang/ruby26/files/patch-sources.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e42001d65b2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby26/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,192 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -206,7 +206,7 @@ AR = @AR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARFLAGS = @ARFLAGS@$(empty)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RANLIB = @RANLIB@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS = @AS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ASFLAGS = @ASFLAGS@ $(INCFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ASFLAGS = @ASFLAGS@ $(ARCH_FLAG) $(INCFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IFCHANGE = $(srcdir)/tool/ifchange
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJDUMP = @OBJDUMP@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCOPY = @OBJCOPY@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- addr2line.c.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ addr2line.c 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,8 +66,8 @@ void *alloca();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_MACH_O_LOADER_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <mach-o/fat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <mach-o/ldsyms.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <mach-o/loader.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <mach-o/nlist.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <mach-o/stab.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1900,6 +1900,7 @@ fill_lines(int num_traces, void **traces
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p = file;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (header->magic == FAT_CIGAM) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct LP(mach_header) *mhp = _NSGetMachExecuteHeader();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct fat_header *fat = (struct fat_header *)file;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *q = file + sizeof(*fat);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t nfat_arch = __builtin_bswap32(fat->nfat_arch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1909,9 +1910,9 @@ fill_lines(int num_traces, void **traces
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpu_type_t cputype = __builtin_bswap32(arch->cputype);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpu_subtype_t cpusubtype = __builtin_bswap32(arch->cpusubtype);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t offset = __builtin_bswap32(arch->offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* fprintf(stderr,"%d: fat %d %x/%x %x/%x\n",__LINE__, i, _mh_execute_header.cputype,_mh_execute_header.cpusubtype, cputype,cpusubtype); */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (_mh_execute_header.cputype == cputype &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (_mh_execute_header.cpusubtype & ~CPU_SUBTYPE_MASK) == cpusubtype) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* fprintf(stderr,"%d: fat %d %x/%x %x/%x\n",__LINE__, i, mhp->cputype,mhp->cpusubtype, cputype,cpusubtype); */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mhp->cputype == cputype &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (mhp->cpusubtype & ~CPU_SUBTYPE_MASK) == cpusubtype) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p = file + offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file = p;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header = (struct LP(mach_header) *)p;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2747,7 +2747,15 @@ AS_IF([test "$with_dln_a_out" != yes], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_IF([test "$rb_cv_dlopen" = yes], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_CASE(["$target_os"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [darwin*], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # The -no_fixup_chains is needed on macOS 12+ to avoid getting a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # warning on the -undefined dynamic_lookup, which in turn disables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # the latter here and breaks the build of ext/bigdecimal/util.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Since options aren't cumulative here, the two options need to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # tested together. Older linkers may not support the added option,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # so we then try the original option alone. This may result in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # a harmless duplicate.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for flag in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-undefined dynamic_lookup -no_fixup_chains" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-undefined dynamic_lookup" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-multiply_defined suppress" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3797,8 +3805,8 @@ AS_IF([test "${universal_binary-no}" = y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(UNIVERSAL_INTS, "${ints}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-" RUBY_PLATFORM_OS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch="${target_cpu}-${target_os}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dln.c.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dln.c 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1347,8 +1347,7 @@ dln_load(const char *file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dln_incompatible_library_p(handle)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined __APPLE__ && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* dlclose() segfaults */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rb_fatal("%s - %s", incompatible, file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- error.c.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ error.c 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -478,7 +478,7 @@ preface_dump(FILE *out)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-- Crash Report log information "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "--------------------------------------------\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " See Crash Report log file under the one of following:\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " * ~/Library/Logs/CrashReporter\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " * /Library/Logs/CrashReporter\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -503,7 +503,7 @@ postscript_dump(FILE *out)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "[IMPORTANT]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*" ------------------------------------------------"*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\n""Don't forget to include the Crash Report log file under\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CrashReporter or "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "DiagnosticReports directory in bug reports.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/openssl/extconf.rb.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/openssl/extconf.rb 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,9 @@ if $mswin || $mingw
</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;'>+ Logging::message "=== Checking for required stuff... ===\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-result = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# mkmf#pkg_config() looks to ignore PKG_CONFIG_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#result = pkg_config("openssl") && have_header("openssl/ssl.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++result = nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def find_openssl_library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if $mswin || $mingw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -862,7 +862,8 @@ check_stack_overflow(int sig, const uint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const greg_t bp = mctx->gregs[REG_EBP];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif defined __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if __DARWIN_UNIX03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define MCTX_SS_REG(reg) __ss.__##reg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define MCTX_SS_REG(reg) ss.reg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/fiddle/helper.rb.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/fiddle/helper.rb 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,6 +95,13 @@ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libm_so = nil if !libm_so || (libm_so[0] == ?/ && !File.file?(libm_so))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# https://github.com/ruby/fiddle/commit/b9e7c7b6e32088e8e02d952b4240b3665859af6b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Use libSystem.B.dylib instead of libm.dylib and libc.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# macOS 11.0+ removed libSystem.B.dylib from /usr/lib. But It works with dlopen.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if RUBY_PLATFORM =~ /darwin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
</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;'>+ if !libc_so || !libm_so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ruby = EnvUtil.rubybin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ldd = `ldd #{ruby}`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tool/transform_mjit_header.rb.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tool/transform_mjit_header.rb 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,7 +176,9 @@ module MJITHeader
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def self.conflicting_types?(code, cc, cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with_code(code) do |path|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd = "#{cc} #{cflags} #{path}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- out = IO.popen(cmd, err: [:child, :out], &:read)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # As per gcc docs, set LC_ALL=C to avoid curly quotes in messages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cmd_env = {"LC_ALL" => "C"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ out = IO.popen(cmd_env, cmd, err: [:child, :out], &:read)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !$?.success? &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (out.match?(/error: conflicting types for '[^']+'/) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ out.match?(/error: redefinition of parameter '[^']+'/))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm.c.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm.c 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "probes_helper.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VALUE rb_str_concat_literals(size_t, const VALUE*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* https://bugs.ruby-lang.org/issues/17777 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void rb_native_mutex_destroy(rb_nativethread_lock_t *lock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PUREFUNC(static inline const VALUE *VM_EP_LEP(const VALUE *));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline const VALUE *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_dump.c.orig 2022-04-12 04:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2023-01-26 16:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -411,7 +411,8 @@ rb_vmdebug_thread_dump_state(VALUE self)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if __DARWIN_UNIX03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define MCTX_SS_REG(reg) __ss.__##reg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define MCTX_SS_REG(reg) ss.reg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -422,7 +423,8 @@ rb_vmdebug_thread_dump_state(VALUE self)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef HAVE_LIBUNWIND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # undef backtrace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define backtrace unw_backtrace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif defined(__APPLE__) && defined(__x86_64__) && defined(HAVE_LIBUNWIND_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__APPLE__) && defined(__x86_64__) && defined(HAVE_LIBUNWIND_H) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define UNW_LOCAL_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <libunwind.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <sys/mman.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/files/patch-test-fiddle-helper.rb.diff b/lang/ruby26/files/patch-test-fiddle-helper.rb.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b82776745f6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/files/patch-test-fiddle-helper.rb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/fiddle/helper.rb.orig 2021-04-05 20:48:34.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/fiddle/helper.rb 2021-04-09 22:38:07.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,6 +95,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libm_so = nil if !libm_so || (libm_so[0] == ?/ && !File.file?(libm_so))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# https://github.com/ruby/fiddle/commit/b9e7c7b6e32088e8e02d952b4240b3665859af6b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Use libSystem.B.dylib instead of libm.dylib and libc.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# macOS 11.0+ removed libSystem.B.dylib from /usr/lib. But It works with dlopen.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if RUBY_PLATFORM =~ /darwin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if !libc_so || !libm_so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ruby = EnvUtil.rubybin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ldd = `ldd #{ruby}`
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/files/patch-tiger.diff b/lang/ruby26/files/patch-tiger.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b27b338fdb2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/files/patch-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./signal.c.orig 2021-07-07 03:38:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./signal.c 2021-09-15 19:38:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -862,7 +862,8 @@ check_stack_overflow(int sig, const uint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const greg_t bp = mctx->gregs[REG_EBP];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # elif defined __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if __DARWIN_UNIX03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define MCTX_SS_REG(reg) __ss.__##reg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define MCTX_SS_REG(reg) ss.reg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./vm_dump.c.orig 2021-07-07 03:38:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./vm_dump.c 2021-09-15 19:38:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -411,7 +411,8 @@ rb_vmdebug_thread_dump_state(VALUE self)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# if __DARWIN_UNIX03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define MCTX_SS_REG(reg) __ss.__##reg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define MCTX_SS_REG(reg) ss.reg
</span></pre><pre style='margin:0'>
</pre>