rake-compiler-dock 1.1.0 → 1.2.0

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