Update 3.1.2 to 3.1.6, patching rake-compiler to build miniruby

This works around the problem described in https://bugs.ruby-lang.org/issues/19239

Author: flavorjones

Dockerfile.jruby

@@ -50,7 +50,9 @@ RUN bash -c " \
         rbenv shell \$v && \
         gem install rake-compiler -v1.2.9 && \
         cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
-        patch -p1 < /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; \
+        for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
+          patch -p1 < \$patch ; \
+        done \
       done \
     "
 

Dockerfile.mri.erb

@@ -93,7 +93,9 @@ RUN bash -c " \
         rbenv shell \$v && \
         gem install rake-compiler -v1.2.9 && \
         cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
-        patch -p1 < /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; \
+        for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
+          patch -p1 < \$patch ; \
+        done \
       done \
     "
 
@@ -113,7 +115,7 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
   [
     # Rubyinstaller-3.1+ is platform x64-mingw-ucrt
-    ["3.4.1:3.3.5:3.2.6:3.1.2", "3.1.6"],
+    ["3.4.1:3.3.5:3.2.6:3.1.6", "3.1.6"],
   ]
 elsif platform =~ /x64-mingw32/
   [
@@ -124,7 +126,7 @@ elsif platform =~ /x64-mingw32/
 else
   [
     ["2.6.10:2.5.9:2.4.10", "2.5.9"],
-    ["3.4.1:3.3.5:3.2.6:3.1.2:3.0.7:2.7.8", "3.1.6"],
+    ["3.4.1:3.3.5:3.2.6:3.1.6:3.0.7:2.7.8", "3.1.6"],
   ]
 end
 
@@ -223,6 +225,6 @@ COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
 RUN bash -c "rbenv global 3.1.6"
 
-ENV RUBY_CC_VERSION=3.4.1:3.3.5:3.2.6:3.1.2:3.0.7:2.7.8:2.6.10:2.5.9:2.4.10
+ENV RUBY_CC_VERSION=3.4.1:3.3.5:3.2.6:3.1.6:3.0.7:2.7.8:2.6.10:2.5.9:2.4.10
 
 CMD bash

build/patches/rake-compiler-1.2.9/0005-build-miniruby-first.patch

@@ -0,0 +1,17 @@
+diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
+index d37ab97b..0df44b30 100644
+--- a/tasks/bin/cross-ruby.rake
++++ b/tasks/bin/cross-ruby.rake
+@@ -129,6 +129,12 @@
+ 
+     # make
+     file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t|
++      puts "MIKE: #{ruby_cc_version}: #{mingw_target}"
++      if ruby_cc_version.start_with?("ruby-3.1") && mingw_target =~ /darwin/
++        # for later 3.1.x releases, we need to explicitly build miniruby
++        # see https://bugs.ruby-lang.org/issues/19239
++        sh "#{MAKE} miniruby", chdir: File.dirname(t.prerequisites.first)
++      end
+       sh MAKE, chdir: File.dirname(t.prerequisites.first)
+     end
+