rake-compiler-dock 1.0.1 → 1.2.1

metadata

@@ -1,43 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  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: 2022-03-17 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
@@ -62,6 +95,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - Dockerfile.jruby
 - Dockerfile.mri.erb
@@ -72,17 +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.7/no_sendfile.patch
-- build/patches/ruby-2.7.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.0/0001-Allow-parallel-builds-of-cross-rubies.patch
-- build/patches2/rake-compiler-1.1.0/0001-Enable-build-of-static-libruby.patch
-- build/patches2/rake-compiler-1.1.0/0001-Fix-determining-of-ruby-versions-in-rake-native-gem.patch
-- build/patches2/rake-compiler-1.1.0/0002-Extend-mingw-search-pattern-to-find-x86_64-gcc.patch
-- build/patches2/rake-compiler-1.1.0/0002-Strip-cross-built-shared-library-files-while-linking.patch
-- build/patches2/ruby-2.7.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
@@ -93,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
@@ -116,12 +163,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+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

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.0/0001-Allow-parallel-builds-of-cross-rubies.patch

@@ -1,119 +0,0 @@
-From e0be66410b32a41591d27c34e2163ed587ae427b Mon Sep 17 00:00:00 2001
-From: Lars Kanis <lars@greiz-reinsdorf.de>
-Date: Sun, 22 Dec 2019 21:37:07 +0100
-Subject: [PATCH] Allow parallel builds of cross rubies
-
-Download and extraction of sources can not run in parallel, since the sources are used for multiple targets.
-Therefore this part can now be separately executed by
-  rake-compiler prepare-sources RUBY_CC_VERSION=...
-
-Afterwards multiple cross rubies can be built in parallel by
-  rake-compiler cross-ruby RUBY_CC_VERSION=... HOST=...
-
-Access to config.yml must be synchronized, when running in parallel, which is done per File#flock .
----
- lib/rake/extensiontask.rb |  5 +++-
- tasks/bin/cross-ruby.rake | 56 +++++++++++++++++++++------------------
- 2 files changed, 34 insertions(+), 27 deletions(-)
-
-diff --git a/lib/rake/extensiontask.rb b/lib/rake/extensiontask.rb
-index d85b1a3..89f2198 100644
---- a/lib/rake/extensiontask.rb
-+++ b/lib/rake/extensiontask.rb
-@@ -376,7 +376,10 @@ Java extension should be preferred.
-         return
-       end
- 
--      config_file = YAML.load_file(config_path)
-+      config_file = File.open(config_path) do |fd|
-+        fd.flock(File::LOCK_SH)
-+        YAML.load(fd.read)
-+      end
- 
-       # tmp_path
-       tmp_path = "#{@tmp_dir}/#{for_platform}/#{@name}/#{ruby_ver}"
-diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
-index 37dd220..3fcfe1d 100644
---- a/tasks/bin/cross-ruby.rake
-+++ b/tasks/bin/cross-ruby.rake
-@@ -126,6 +126,8 @@ file makefile_in => [makefile_in_bak] do |t|
-   }
- end
- 
-+task "prepare-sources" => makefile_in
-+
- task :mingw32 do
-   unless MINGW_HOST then
-     warn "You need to install mingw32 cross compile functionality to be able to continue."
-@@ -174,40 +176,42 @@ task :install => ["#{USER_HOME}/ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}/bin/ruby.e
- desc "Update rake-compiler list of installed Ruby versions"
- task 'update-config' do
-   config_file = "#{USER_HOME}/config.yml"
--  if File.exist?(config_file) then
--    puts "Updating #{config_file}"
--    config = YAML.load_file(config_file)
--  else
--    puts "Generating #{config_file}"
--    config = {}
--  end
-+  File.open(config_file, File::RDWR|File::CREAT) do |config_fd|
-+    config_fd.flock(File::LOCK_EX)
-+    config = YAML.load(config_fd.read)
-+    if config
-+      puts "Updating #{config_file}"
-+    else
-+      puts "Generating #{config_file}"
-+      config = {}
-+    end
- 
--  files = Dir.glob("#{USER_HOME}/ruby/*/*/**/rbconfig.rb").sort
-+    files = Dir.glob("#{USER_HOME}/ruby/*/*/**/rbconfig.rb").sort
- 
--  files.each do |rbconfig|
--    version, platform = rbconfig.match(/.*-(\d.\d.\d).*\/([-\w]+)\/rbconfig/)[1,2]
--    platforms = [platform]
-+    files.each do |rbconfig|
-+      version, platform = rbconfig.match(/.*-(\d.\d.\d).*\/([-\w]+)\/rbconfig/)[1,2]
-+      platforms = [platform]
- 
--    # fake alternate (binary compatible) i386-mswin32-60 platform
--    platform == "i386-mingw32" and
--      platforms.push "i386-mswin32-60"
-+      # fake alternate (binary compatible) i386-mswin32-60 platform
-+      platform == "i386-mingw32" and
-+        platforms.push "i386-mswin32-60"
- 
--    platforms.each do |plat|
--      config["rbconfig-#{plat}-#{version}"] = rbconfig
-+      platforms.each do |plat|
-+        config["rbconfig-#{plat}-#{version}"] = rbconfig
- 
--      # also store RubyGems-compatible version
--      gem_platform = Gem::Platform.new(plat)
--      config["rbconfig-#{gem_platform}-#{version}"] = rbconfig
-+        # also store RubyGems-compatible version
-+        gem_platform = Gem::Platform.new(plat)
-+        config["rbconfig-#{gem_platform}-#{version}"] = rbconfig
-+      end
-+
-+      puts "Found Ruby version #{version} for platform #{platform} (#{rbconfig})"
-     end
- 
--    puts "Found Ruby version #{version} for platform #{platform} (#{rbconfig})"
-+    when_writing("Saving changes into #{config_file}") {
-+      config_fd.rewind
-+      config_fd.puts config.to_yaml
-+    }
-   end
--
--  when_writing("Saving changes into #{config_file}") {
--    File.open(config_file, 'w') do |f|
--      f.puts config.to_yaml
--    end
--  }
- end
- 
- task :default do
--- 
-2.20.1
-

data/build/patches2/rake-compiler-1.1.0/0001-Enable-build-of-static-libruby.patch

@@ -1,28 +0,0 @@
-From 0b929b7027eb592c0971a400184f1dfa5a0bce7c Mon Sep 17 00:00:00 2001
-From: Lars Kanis <lars@greiz-reinsdorf.de>
-Date: Thu, 26 Dec 2019 19:13:48 +0100
-Subject: [PATCH 1/2] Enable build of static libruby
-
-This is used in rake-compiler-dock for linux targets.
-The static libruby is postprocessed in a special way.
-See rake-compiler-dock's Dockerfile.
----
- tasks/bin/cross-ruby.rake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
-index c9b0bbb..2a73be7 100644
---- a/tasks/bin/cross-ruby.rake
-+++ b/tasks/bin/cross-ruby.rake
-@@ -108,6 +108,8 @@ end
- file "#{build_dir}/Makefile" => [build_dir, makefile_in] do |t|
-
-   options = [
-+    '--enable-static',
-+    '--enable-install-static-library',
-     "--host=#{MINGW_HOST}",
-     "--target=#{MINGW_TARGET}",
-     "--build=#{RUBY_BUILD}",
---
-2.20.1
-

data/build/patches2/rake-compiler-1.1.0/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.0/0002-Extend-mingw-search-pattern-to-find-x86_64-gcc.patch

@@ -1,26 +0,0 @@
-From 07b1a4909fa59324d309bb8a46867cacba97cafd Mon Sep 17 00:00:00 2001
-From: Lars Kanis <lars@greiz-reinsdorf.de>
-Date: Thu, 26 Dec 2019 18:31:25 +0100
-Subject: [PATCH] Extend mingw search pattern to find x86_64 gcc
-
-The previous pattern only recognized 32 bit compiler versions.
----
- lib/rake/extensioncompiler.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/rake/extensioncompiler.rb b/lib/rake/extensioncompiler.rb
-index b3d336b..75f4694 100644
---- a/lib/rake/extensioncompiler.rb
-+++ b/lib/rake/extensioncompiler.rb
-@@ -37,7 +37,7 @@ module Rake
-       paths = ENV['PATH'].split(File::PATH_SEPARATOR)
- 
-       # the pattern to look into (captures *nix and windows executables)
--      pattern = "{mingw32-,i?86*mingw*}gcc{,.*}"
-+      pattern = "{mingw32-,i?86*mingw*,x86*mingw*}gcc{,.*}"
- 
-       @mingw_gcc_executable = paths.find do |path|
-         # cleanup paths before globbing
--- 
-2.20.1
-

data/build/patches2/rake-compiler-1.1.0/0002-Strip-cross-built-shared-library-files-while-linking.patch

@@ -1,29 +0,0 @@
-From 13e33405d4e51a52402e1e37e7e2df7f1f32892d Mon Sep 17 00:00:00 2001
-From: Lars Kanis <lars@greiz-reinsdorf.de>
-Date: Thu, 26 Dec 2019 19:18:02 +0100
-Subject: [PATCH 2/2] Strip cross built shared library files while linking
-
-The .so files of extensions are often stripped after compilation per task in a Rakefile.
-However this can be omitted, if the cross ruby version is built with stripping enabled.
-Stripping the files a second time doesn't make a difference then.
----
- tasks/bin/cross-ruby.rake | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
-index 2a73be7..a9eb16b 100644
---- a/tasks/bin/cross-ruby.rake
-+++ b/tasks/bin/cross-ruby.rake
-@@ -115,7 +115,8 @@ file "#{build_dir}/Makefile" => [build_dir, source_dir] do |t|
-     "--build=#{RUBY_BUILD}",
-     '--enable-shared',
-     '--disable-install-doc',
--    '--with-ext='
-+    '--with-ext=',
-+    'LDFLAGS=-pipe -s',
-   ]
- 
-   # Force Winsock2 for Ruby 1.8, 1.9 defaults to it
--- 
-2.20.1
-

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