rake-compiler-dock 1.1.0 → 1.2.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Lars Kanis
@@ -10,55 +10,67 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPDCCAiSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADBEMQ0wCwYDVQQDDARsYXJz
-  MR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZImiZPyLGQB
-  GRYCZGUwHhcNMjAxMjI2MTgzMzUyWhcNMjExMjI2MTgzMzUyWjBEMQ0wCwYDVQQD
-  DARsYXJzMR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZIm
-  iZPyLGQBGRYCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb4Uv
-  RFJfRu/VEWiy3psh2jinETjiuBrL0NeRFGf8H7iU9+gx/DI/FFhfHGLrDeIskrJx
-  YIWDMmEjVO10UUdj7wu4ZhmU++0Cd7Kq9/TyP/shIP3IjqHjVLCnJ3P6f1cl5rxZ
-  gqo+d3BAoDrmPk0rtaf6QopwUw9RBiF8V4HqvpiY+ruJotP5UQDP4/lVOKvA8PI9
-  P0GmVbFBrbc7Zt5h78N3UyOK0u+nvOC23BvyHXzCtcFsXCoEkt+Wwh0RFqVZdnjM
-  LMO2vULHKKHDdX54K/sbVCj9pN9h1aotNzrEyo55zxn0G9PHg/G3P8nMvAXPkUTe
-  brhXrfCwWRvOXA4TAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
-  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQsFAAOCAQEA
-  DT6QoI7WEM1wivGn5BBHv3hJa2vGgmAxSPy7QM5iQX7U2ROfOeXYIHIRxsIv/cQl
-  +F568J6v3GAcFePi4Is9S7b8KWQkm+IjrPjL863hds6WVG8KyJZ758oczbviXNEV
-  vzna4S8Ra0m7LqGYGZW9B8ZIVdfhzKAF6V6iVlQtEFP7GQp17SjpNPd/gCbictIw
-  +jwual4DCn3p1X+Vgyl/AXPwU1NBAuuYUijOr7dVIoW2QNUh2d7jCwGe2mNi7Dbu
-  CqyDIUe+OuWLEpvgupYpVKQKx4+pa0s2ccLokMXYGFp1Z36heaYApV92yDjks8Sq
-  XtSi3zpLl4JPGBoeuZj97Q==
+  MIIETTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+  L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yMjAyMTQxMzMwNTZaFw0yMzAy
+  MTQxMzMwNTZaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+  PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
+  mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
+  eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
+  8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
+  SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
+  JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
+  eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
+  chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
+  9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjgYEwfzAJ
+  BgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOIdbSMr3VFrTCO9/cTM0
+  0exHzBcwIgYDVR0RBBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwIgYDVR0S
+  BBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwDQYJKoZIhvcNAQELBQADggGB
+  AFWP7F/y3Oq3NgrqUOnjKOeDaBa7AqNhHS+PZg+C90lnJzMgOs4KKgZYxqSQVSab
+  SCEmzIO/StkXY4NpJ4fYLrHemf/fJy1wPyu+fNdp5SEEUwEo+2toRFlzTe4u4LdS
+  QC636nPPTMt8H3xz2wf/lUIUeo2Qc95Qt2BQM465ibbG9kmA3c7Sopx6yOabYOAl
+  KPRbOSEPiWYcF9Suuz8Gdf8jxEtPlnZiwRvnYJ+IHMq3XQCJWPpMzdDMbtlgHbXE
+  vq1zOTLMSYAS0UB3uionR4yo1hLz60odwkCm7qf0o2Ci/5OjtB0a89VuyqRU2vUJ
+  QH95WBjDJ6lCCW7J0mrMPnJQSUFTmufsU6jOChvPaCeAzW1YwrsP/YKnvwueG7ip
+  VOdW6RitjtFxhS7evRL0201+KUvLz12zZWWjOcujlQs64QprxOtiv/MiisKb1Ng+
+  oL1mUdzB8KrZL4/WbG5YNX6UTtJbIOu9qEFbBAy4/jtIkJX+dlNoFwd4GXQW1YNO
+  nA==
   -----END CERTIFICATE-----
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +95,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - Dockerfile.jruby
 - Dockerfile.mri.erb
@@ -93,18 +106,13 @@ files:
 - Rakefile
 - bin/rake-compiler-dock
 - build/gem_helper.rb
+- build/math_h.patch
 - build/mk_i686.rb
 - build/parallel_docker_build.rb
-- build/patches/ruby-2.5.8/no_sendfile.patch
-- build/patches/ruby-3.0.0/no_sendfile.patch
-- build/patches2/hoe-3.20.0/0001-Load-encrypted-private-key-using-ENV-GEM_PRIVATE_KEY.patch
-- build/patches2/rake-compiler-1.1.1/0001-Fix-determining-of-ruby-versions-in-rake-native-gem.patch
-- build/patches2/rake-compiler-1.1.1/0003-Allow-building-of-cross-rubies-in-parallel.patch
-- build/patches2/rake-compiler-1.1.1/0004-Enable-build-of-static-libruby.patch
-- build/patches2/rake-compiler-1.1.1/0005-Don-t-mask-out-build-env-vars-for-cross-ruby.patch
-- build/patches2/rake-compiler-1.1.1/0006-Use-RAKE_EXTENSION_TASK_NO_NATIVE-env-var-as-the-def.patch
-- build/patches2/ruby-2.7.0/ruby2_keywords.patch
-- build/patches2/ruby-3.0.0/ruby2_keywords.patch
+- build/patches/ruby-2.5.9/no_sendfile.patch
+- build/patches/ruby-3.1.0/no_sendfile.patch
+- build/patches2/rake-compiler-1.1.6/0004-Enable-build-of-static-libruby.patch
+- build/rcd-env.sh
 - build/runas
 - build/sigfw.c
 - build/strip_wrapper
@@ -115,7 +123,24 @@ files:
 - lib/rake_compiler_dock/predefined_user_group.rb
 - lib/rake_compiler_dock/starter.rb
 - lib/rake_compiler_dock/version.rb
+- mingw64-ucrt/Dockerfile
+- mingw64-ucrt/binutils-mingw-w64-ignore-check-errors.patch
+- mingw64-ucrt/gcc-mingw-w64-only-c-c++.patch
+- mingw64-ucrt/mingw-w64-enable-ucrt.patch
 - rake-compiler-dock.gemspec
+- test/env/Dockerfile.alpine
+- test/env/Dockerfile.centos
+- test/env/Dockerfile.debian
+- test/rcd_test/Gemfile
+- test/rcd_test/Rakefile
+- test/rcd_test/ext/java/RcdTestExtService.java
+- test/rcd_test/ext/java/RubyRcdTest.java
+- test/rcd_test/ext/mri/extconf.rb
+- test/rcd_test/ext/mri/rcd_test_ext.c
+- test/rcd_test/ext/mri/rcd_test_ext.h
+- test/rcd_test/lib/rcd_test.rb
+- test/rcd_test/rcd_test.gemspec
+- test/rcd_test/test/test_basic.rb
 - test/test_environment_variables.rb
 - test/test_parallel_docker_build.rb
 - test/test_starter.rb
@@ -138,12 +163,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows
   and Linux binary gems.
 test_files:
+- test/env/Dockerfile.alpine
+- test/env/Dockerfile.centos
+- test/env/Dockerfile.debian
+- test/rcd_test/Gemfile
+- test/rcd_test/Rakefile
+- test/rcd_test/ext/java/RcdTestExtService.java
+- test/rcd_test/ext/java/RubyRcdTest.java
+- test/rcd_test/ext/mri/extconf.rb
+- test/rcd_test/ext/mri/rcd_test_ext.c
+- test/rcd_test/ext/mri/rcd_test_ext.h
+- test/rcd_test/lib/rcd_test.rb
+- test/rcd_test/rcd_test.gemspec
+- test/rcd_test/test/test_basic.rb
 - test/test_environment_variables.rb
 - test/test_parallel_docker_build.rb
 - test/test_starter.rb

metadata.gz.sig

@@ -1,2 +1,2 @@
-
-� ;�&%$xu�Q�����G�A�Ơ�9r\ZA�'g
+,1o�0����o����ɂl��4.y��Ɩ
Ǚ^(���/�

F^P�A��F��"M2��0����3O�tY��?��AYͨ\:L�4��M�QZͩY&~�w�����#t܆-�;鼍_�>�J06܉���X#E�M+�����K�;0-�I(N@*���M��J���2�2h�(cS�+��+L�C���6���/����Kr��N�2Kz����Ց��(����e�	�R�D��߬ªRɲ��j��2[j���.P֭�OE�
��Op:z�zP�ɀ=�y�%Y飗^�MRjo�8b9�~W�#Uq�=�p�
+\��AP�"�e(�3�\�2Xm�
��n��$����¼jU��c7����).�f|��y�v��mH��M�LՍ��

data/build/patches2/hoe-3.20.0/0001-Load-encrypted-private-key-using-ENV-GEM_PRIVATE_KEY.patch

@@ -1,32 +0,0 @@
-From ecc5669223457ceaba6bd94c2947ae99ddfa8f10 Mon Sep 17 00:00:00 2001
-From: Lars Kanis <lars@greiz-reinsdorf.de>
-Date: Fri, 27 Dec 2019 15:57:07 +0100
-Subject: [PATCH] Load encrypted private key using
- ENV['GEM_PRIVATE_KEY_PASSPHRASE'] as passphrase.
-
-This way the password can be avoided to be entered several times when building multiple gems.
-It also allows parallel builds which are incompatible to interactive password prompts.
-
-The same feature has been implemented in rubygems:
-  https://github.com/rubygems/rubygems/commit/c1a114396fcec124d3feabf74708b4bdec02eac3
----
- lib/hoe/signing.rb | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/hoe/signing.rb b/lib/hoe/signing.rb
-index 4833c55..11c8c2f 100644
---- a/lib/hoe/signing.rb
-+++ b/lib/hoe/signing.rb
-@@ -70,7 +70,8 @@ module Hoe::Signing
-     end
-
-     if signing_key and cert_chain then
--      spec.signing_key = OpenSSL::PKey::RSA.new File.read signing_key
-+      passphrase = ENV['GEM_PRIVATE_KEY_PASSPHRASE']
-+      spec.signing_key = OpenSSL::PKey::RSA.new(File.read(signing_key), passphrase)
-       spec.cert_chain = cert_chain
-     end
-   end
---
-2.20.1
-

data/build/patches2/rake-compiler-1.1.1/0001-Fix-determining-of-ruby-versions-in-rake-native-gem.patch

@@ -1,44 +0,0 @@
-From 365843bfe0bfc3f1c1b11e81e24ac7b6c7942bdf Mon Sep 17 00:00:00 2001
-From: Lars Kanis <lars@greiz-reinsdorf.de>
-Date: Fri, 27 Dec 2019 18:18:59 +0100
-Subject: [PATCH] Fix determining of ruby versions in "rake native gem"
-
-"rake native gem" without "cross" didn't set the ruby version constraint.
-Instead it failed with NoMethodError like so:
-
-/ffi $ rake native gem
-no configuration section for specified version of Ruby (rbconfig-i386-mingw32-2.6.3)
-no configuration section for specified version of Ruby (rbconfig-x64-mingw32-2.6.3)
-install -c build/x86_64-linux/ffi_c/2.6.3/ffi_c.so lib/ffi_c.so
-cp build/x86_64-linux/ffi_c/2.6.3/ffi_c.so build/x86_64-linux/stage/lib/ffi_c.so
-rake aborted!
-NoMethodError: undefined method `split' for nil:NilClass
-/home/lars/.rvm/gems/ruby-2.6.3/gems/rake-compiler-1.0.9/lib/rake/extensiontask.rb:515:in `ruby_api_version'
-/home/lars/.rvm/gems/ruby-2.6.3/gems/rake-compiler-1.0.9/lib/rake/extensiontask.rb:262:in `block in define_native_tasks'
-/home/lars/.rvm/gems/ruby-2.6.3/gems/rake-12.3.3/exe/rake:27:in `<top (required)>'
-/home/lars/.rvm/gems/ruby-2.6.3/bin/ruby_executable_hooks:24:in `eval'
-/home/lars/.rvm/gems/ruby-2.6.3/bin/ruby_executable_hooks:24:in `<main>'
-Tasks: TOP => native => native:x86_64-linux => native:ffi:x86_64-linux
-(See full trace by running task with --trace)
----
- lib/rake/extensiontask.rb | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/rake/extensiontask.rb b/lib/rake/extensiontask.rb
-index d85b1a3..cb1ea12 100644
---- a/lib/rake/extensiontask.rb
-+++ b/lib/rake/extensiontask.rb
-@@ -242,6 +242,10 @@ Java extension should be preferred.
-       # lib_path
-       lib_path = lib_dir
-
-+      # Update compiled platform/version combinations
-+      ruby_versions = (@ruby_versions_per_platform[platf] ||= [])
-+      ruby_versions << ruby_ver
-+
-       # create 'native:gem_name' and chain it to 'native' task
-       unless Rake::Task.task_defined?("native:#{@gem_spec.name}:#{platf}")
-         task "native:#{@gem_spec.name}:#{platf}" do |t|
---
-2.20.1
-

data/build/patches2/rake-compiler-1.1.1/0003-Allow-building-of-cross-rubies-in-parallel.patch

@@ -1,214 +0,0 @@
-From 01fd7364bdcb37ac8709ffa48388b5cbe6478211 Mon Sep 17 00:00:00 2001
-From: Lars Kanis <lars@greiz-reinsdorf.de>
-Date: Fri, 10 Jan 2020 23:57:18 +0100
-Subject: [PATCH] Allow building of cross rubies in parallel
-
-Rubies can be build like so:
-  rake-compiler cross-ruby VERSION=2.7.0:2.6.0 HOST=x86_64-w64-mingw32:i686-w64-mingw32
-
-This builds the cross product of all ":" separated ruby and host versions.
-To force sequential builds add option "-j1".
----
- tasks/bin/cross-ruby.rake | 161 +++++++++++++++++++-------------------
- 1 file changed, 80 insertions(+), 81 deletions(-)
-
-diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
-index 278541c..8b88025 100644
---- a/tasks/bin/cross-ruby.rake
-+++ b/tasks/bin/cross-ruby.rake
-@@ -41,106 +41,105 @@ end
- require 'rake/extensioncompiler'
- 
- MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system("#{c} -v > /dev/null 2>&1") }
--USER_HOME = File.expand_path("~/.rake-compiler")
--RUBY_CC_VERSION = "ruby-" << ENV.fetch("VERSION", "1.8.7-p371")
-+USER_HOME = File.realpath(File.expand_path("~/.rake-compiler"))
- RUBY_SOURCE = ENV['SOURCE']
- RUBY_BUILD = RbConfig::CONFIG["host"]
- 
--# grab the major "1.8" or "1.9" part of the version number
--MAJOR = RUBY_CC_VERSION.match(/.*-(\d.\d).\d/)[1]
--
--# Use Rake::ExtensionCompiler helpers to find the proper host
--MINGW_HOST = ENV['HOST'] || Rake::ExtensionCompiler.mingw_host
--MINGW_TARGET = MINGW_HOST.gsub('msvc', '')
--
- # Unset any possible variable that might affect compilation
- ["CC", "CXX", "CPPFLAGS", "LDFLAGS", "RUBYOPT"].each do |var|
-   ENV.delete(var)
- end
- 
--source_dir = "#{USER_HOME}/sources/#{RUBY_CC_VERSION}"
--build_dir = "#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}"
--
--# define a location where sources will be stored
--directory source_dir
--directory build_dir
--
--# clean intermediate files and folders
--CLEAN.include(source_dir)
--CLEAN.include(build_dir)
--
--# remove the final products and sources
--CLOBBER.include("#{USER_HOME}/sources")
--CLOBBER.include("#{USER_HOME}/builds")
--CLOBBER.include("#{USER_HOME}/ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}")
--CLOBBER.include("#{USER_HOME}/config.yml")
-+RUBY_CC_VERSIONS = ENV.fetch("VERSION", "1.8.7-p371")
-+RUBY_CC_VERSIONS.split(":").each do |ruby_cc_version|
-+  ruby_cc_version = "ruby-" + ruby_cc_version
-+  # grab the major "1.8" or "1.9" part of the version number
-+  major = ruby_cc_version.match(/.*-(\d.\d).\d/)[1]
-+
-+  # define a location where sources will be stored
-+  source_dir = "#{USER_HOME}/sources/#{ruby_cc_version}"
-+  directory source_dir
-+  # clean intermediate files and folders
-+  CLEAN.include(source_dir)
-+
-+  # remove the final products and sources
-+  CLOBBER.include("#{USER_HOME}/sources")
-+  CLOBBER.include("#{USER_HOME}/builds")
-+  CLOBBER.include("#{USER_HOME}/config.yml")
-+
-+  # Extract the sources
-+  source_file = RUBY_SOURCE ? RUBY_SOURCE.split('/').last : "#{ruby_cc_version}.tar.bz2"
-+  file source_dir => ["#{USER_HOME}/sources/#{source_file}"] do |t|
-+    t.prerequisites.each { |f| sh "tar xf #{File.basename(f)}", chdir: File.dirname(t.name) }
-+  end
- 
--# ruby source file should be stored there
--file "#{USER_HOME}/sources/#{RUBY_CC_VERSION}.tar.bz2" => ["#{USER_HOME}/sources"] do |t|
--  # download the source file using wget or curl
--  chdir File.dirname(t.name) do
-+  # ruby source file should be stored there
-+  file "#{USER_HOME}/sources/#{ruby_cc_version}.tar.bz2" => ["#{USER_HOME}/sources"] do |t|
-+    # download the source file using wget or curl
-     if RUBY_SOURCE
-       url = RUBY_SOURCE
-     else
--      url = "http://cache.ruby-lang.org/pub/ruby/#{MAJOR}/#{File.basename(t.name)}"
-+      url = "http://cache.ruby-lang.org/pub/ruby/#{major}/#{File.basename(t.name)}"
-     end
--    sh "wget #{url} || curl -O #{url}"
-+    sh "wget #{url} || curl -O #{url}", chdir: File.dirname(t.name)
-   end
--end
--
--# Extract the sources
--source_file = RUBY_SOURCE ? RUBY_SOURCE.split('/').last : "#{RUBY_CC_VERSION}.tar.bz2"
--file source_dir => ["#{USER_HOME}/sources/#{source_file}"] do |t|
--  chdir File.dirname(t.name) do
--    t.prerequisites.each { |f| sh "tar xf #{File.basename(f)}" }
--  end
--end
- 
--task :mingw32 do
--  unless MINGW_HOST then
--    warn "You need to install mingw32 cross compile functionality to be able to continue."
--    warn "Please refer to your distribution/package manager documentation about installation."
--    fail
--  end
--end
-+  # Create tasks for each host out of the ":" separated hosts list in the HOST variable.
-+  # These tasks are processed in parallel as dependencies to the "install" task.
-+  mingw_hosts = ENV['HOST'] || Rake::ExtensionCompiler.mingw_host
-+  mingw_hosts.split(":").each do |mingw_host|
-+
-+    # Use Rake::ExtensionCompiler helpers to find the proper host
-+    mingw_target = mingw_host.gsub('msvc', '')
-+
-+    # define a location where built files for each host will be stored
-+    build_dir = "#{USER_HOME}/builds/#{mingw_host}/#{ruby_cc_version}"
-+    directory build_dir
-+    install_dir = "#{USER_HOME}/ruby/#{mingw_host}/#{ruby_cc_version}"
-+
-+    # clean intermediate files and folders
-+    CLEAN.include(build_dir)
-+    CLOBBER.include(install_dir)
-+
-+    task :mingw32 do
-+      unless mingw_host then
-+        warn "You need to install mingw32 cross compile functionality to be able to continue."
-+        warn "Please refer to your distribution/package manager documentation about installation."
-+        fail
-+      end
-+    end
- 
--# generate the makefile in a clean build location
--file "#{build_dir}/Makefile" => [build_dir, source_dir] do |t|
--
--  options = [
--    "--host=#{MINGW_HOST}",
--    "--target=#{MINGW_TARGET}",
--    "--build=#{RUBY_BUILD}",
--    '--enable-shared',
--    '--disable-install-doc',
--    '--with-ext=',
--    'LDFLAGS=-pipe -s',
--  ]
--
--  # Force Winsock2 for Ruby 1.8, 1.9 defaults to it
--  options << "--with-winsock2" if MAJOR == "1.8"
--
--  chdir File.dirname(t.name) do
--    prefix = File.expand_path("../../../ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}")
--    options << "--prefix=#{prefix}"
--    sh File.expand_path("../../../sources/#{RUBY_CC_VERSION}/configure"), *options
--  end
--end
-+    # generate the makefile in a clean build location
-+    file "#{build_dir}/Makefile" => [build_dir, source_dir] do |t|
-+
-+      options = [
-+        "--host=#{mingw_host}",
-+        "--target=#{mingw_target}",
-+        "--build=#{RUBY_BUILD}",
-+        '--enable-shared',
-+        '--disable-install-doc',
-+        '--with-ext=',
-+        'LDFLAGS=-pipe -s',
-+      ]
-+
-+      # Force Winsock2 for Ruby 1.8, 1.9 defaults to it
-+      options << "--with-winsock2" if major == "1.8"
-+      options << "--prefix=#{install_dir}"
-+      sh File.expand_path("#{USER_HOME}/sources/#{ruby_cc_version}/configure"), *options, chdir: File.dirname(t.name)
-+    end
- 
--# make
--file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t|
--  chdir File.dirname(t.prerequisites.first) do
--    sh MAKE
--  end
--end
-+    # make
-+    file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t|
-+      sh MAKE, chdir: File.dirname(t.prerequisites.first)
-+    end
- 
--# make install
--file "#{USER_HOME}/ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}/bin/ruby.exe" => ["#{build_dir}/ruby.exe"] do |t|
--  chdir File.dirname(t.prerequisites.first) do
--    sh "#{MAKE} install"
-+    # make install
-+    file "#{USER_HOME}/ruby/#{mingw_host}/#{ruby_cc_version}/bin/ruby.exe" => ["#{build_dir}/ruby.exe"] do |t|
-+      sh "#{MAKE} install", chdir: File.dirname(t.prerequisites.first)
-+    end
-+    multitask :install => ["#{USER_HOME}/ruby/#{mingw_host}/#{ruby_cc_version}/bin/ruby.exe"]
-   end
- end
--task :install => ["#{USER_HOME}/ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}/bin/ruby.exe"]
- 
- desc "Update rake-compiler list of installed Ruby versions"
- task 'update-config' do
-@@ -187,5 +186,5 @@ task :default do
-   Rake.application.display_tasks_and_comments
- end
- 
--desc "Build #{RUBY_CC_VERSION} suitable for cross-platform development."
-+desc "Build rubies suitable for cross-platform development."
- task 'cross-ruby' => [:mingw32, :install, 'update-config']
--- 
-2.20.1
-

data/build/patches2/rake-compiler-1.1.1/0005-Don-t-mask-out-build-env-vars-for-cross-ruby.patch

@@ -1,30 +0,0 @@
-From 783d3d380e6abf107e0747d229da0f5e001c623f Mon Sep 17 00:00:00 2001
-From: Lars Kanis <lars@greiz-reinsdorf.de>
-Date: Sun, 20 Dec 2020 19:08:22 +0100
-Subject: [PATCH] Don't mask out build env vars for cross-ruby
-
-This was introduced in commit a7c113e580c1565000166f9967da82ff2ecdaeaa to avoid interference with host build.
-However it prohibits setting important flags for cross-build.
-
-Also don't force 'LDFLAGS=-pipe -s' in configure, which doesn't work with clang targeting MacOS.
-It can now be set externally.
----
- tasks/bin/cross-ruby.rake | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
-index 8edf5cd..8317a2a 100644
---- a/tasks/bin/cross-ruby.rake
-+++ b/tasks/bin/cross-ruby.rake
-@@ -46,7 +46,7 @@ RUBY_SOURCE = ENV['SOURCE']
- RUBY_BUILD = RbConfig::CONFIG["host"]
-
- # Unset any possible variable that might affect compilation
--["CC", "CXX", "CPPFLAGS", "LDFLAGS", "RUBYOPT"].each do |var|
-+["RUBYOPT"].each do |var|
-   ENV.delete(var)
- end
-
---
-2.27.0
-

data/build/patches2/rake-compiler-1.1.1/0006-Use-RAKE_EXTENSION_TASK_NO_NATIVE-env-var-as-the-def.patch

@@ -1,26 +0,0 @@
-From 15f630adc4325f9cafb762e15a051c2ec8bd21e2 Mon Sep 17 00:00:00 2001
-From: Sutou Kouhei <kou@clear-code.com>
-Date: Mon, 21 Dec 2020 04:30:44 +0900
-Subject: [PATCH] Use RAKE_EXTENSION_TASK_NO_NATIVE env var as the default
- value
-
----
- lib/rake/extensiontask.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/rake/extensiontask.rb b/lib/rake/extensiontask.rb
-index b0ab88e..49d59da 100644
---- a/lib/rake/extensiontask.rb
-+++ b/lib/rake/extensiontask.rb
-@@ -23,7 +23,7 @@ module Rake
-       @cross_compile = false
-       @cross_config_options = []
-       @cross_compiling = nil
--      @no_native = false
-+      @no_native = (ENV["RAKE_EXTENSION_TASK_NO_NATIVE"] == "true")
-       @config_includes = []
-       @ruby_versions_per_platform = {}
-       @make = nil
--- 
-2.27.0
-

data/build/patches2/ruby-2.7.0/ruby2_keywords.patch

@@ -1,15 +0,0 @@
-diff --git a/template/fake.rb.in b/template/fake.rb.in
-index f1da719ecb..e0b649fb28 100644
---- a/template/fake.rb.in
-+++ b/template/fake.rb.in
-@@ -27,6 +27,10 @@ case "$0" in /*) r=-r"$0";; *) r=-r"./$0";; esac
- exec $ruby "$r" "$@"
- =end
- =baseruby
-+<% if RUBY_VERSION < "2.7" %>
-+def ruby2_keywords(*)
-+end
-+<% end %>
- class Object
-   remove_const :CROSS_COMPILING if defined?(CROSS_COMPILING)
-   CROSS_COMPILING = RUBY_PLATFORM

data/build/patches2/ruby-3.0.0/ruby2_keywords.patch

@@ -1,15 +0,0 @@
-diff --git a/template/fake.rb.in b/template/fake.rb.in
-index f1da719ecb..e0b649fb28 100644
---- a/template/fake.rb.in
-+++ b/template/fake.rb.in
-@@ -27,6 +27,10 @@ case "$0" in /*) r=-r"$0";; *) r=-r"./$0";; esac
- exec $ruby "$r" "$@"
- =end
- =baseruby
-+<% if RUBY_VERSION < "2.7" %>
-+def ruby2_keywords(*)
-+end
-+<% end %>
- class Object
-   remove_const :CROSS_COMPILING if defined?(CROSS_COMPILING)
-   CROSS_COMPILING = RUBY_PLATFORM