rake-compiler-dock 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfdfefd55e7a9101359d39e3aaed0e8a63c046b0a1952efe5d291032b582b37
-  data.tar.gz: cc50befca4c133b28bc13834a1c619250bd1aa4d7743e95fcfef47cd62330082
+  metadata.gz: 7bbe8d21de2a30484e2ec2d877bf6e2e2538c7f02d207e924716d9bb99609fbf
+  data.tar.gz: 2069a049a2a9974a98f13bfd704f60f8e07dc5741f2e0f5d18a6c4f122358875
 SHA512:
-  metadata.gz: 8ed46ae89b00549dba2a66a7b079e2d7977f4031fcf38658f4f030bf6923a1b7e49da02986635766f7d0bd86a1bf4ff7f6252ea2d6d79dba86c00488e2a928fe
-  data.tar.gz: 193b8d63b2d747f652dd33e10b7c7c950ad92b46eff8067dfe14f11a18b126d90049dc7ea1ec57689f6fe3a38eb3358e8e3f8ffdf50dcbe3bdfb41b6d8db1886
+  metadata.gz: 197abac03aa2262d6893e4f79dcb9fa63bbf7018afa70d6ea7c189abc390074a36c7892b6745e8399ffbe4309686b5310c382d5227dfe9906d6bd875a561b5af
+  data.tar.gz: 184393bac4b1890e1c19567c7c80ecc3a015e78e8789232c4f00a28d7c2a6ba0209ae94e9c1ffa2dcbd58bcd9eb8a1875732c32263cdbd47499437bc0e3617aa

data/Dockerfile.jruby

@@ -1,7 +1,7 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 RUN apt-get -y update && \
-    apt-get install -y curl git-core xz-utils wget unzip sudo gpg dirmngr openjdk-11-jdk-headless && \
+    apt-get install -y curl git-core xz-utils wget unzip sudo gpg dirmngr openjdk-14-jdk-headless && \
     rm -rf /var/lib/apt/lists/*
 
 # Add "rvm" as system group, to avoid conflicts with host GIDs typically starting with 1000
@@ -26,7 +26,7 @@ ENV BASH_ENV /etc/rubybashrc
 # install rubies and fix permissions on
 RUN bash -c " \
     export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
-    for v in jruby-9.2.9.0 ; do \
+    for v in jruby-9.2.14.0 ; do \
         rvm install --binary \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
     done && \
     rvm cleanup all && \
@@ -46,8 +46,8 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 
 USER root
 
-RUN bash -c "rvm alias create default jruby-9.2.9.0"
-RUN echo "rvm use jruby-9.2.9.0 > /dev/null" >> /etc/rubybashrc
+RUN bash -c "rvm alias create default jruby-9.2.14.0"
+RUN echo "rvm use jruby-9.2.14.0 > /dev/null" >> /etc/rubybashrc
 
 # Add rvm to the global bashrc
 RUN echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc

data/Dockerfile.mri.erb

@@ -1,12 +1,34 @@
-FROM ubuntu:<%= platform=~/linux/ ? "16.04" : "18.04" %>
+FROM <%=
+  case platform
+    when /x86_64-linux/ then "quay.io/pypa/manylinux2014_x86_64"
+    when /x86-linux/ then "quay.io/pypa/manylinux2014_i686"
+    else "ubuntu:20.04"
+  end %>
 
+<% if platform=~/linux/ %>
+# install packages which rvm will require
+RUN yum install -y autoconf gcc-c++ libtool readline-devel sqlite-devel ruby openssl-devel xz cmake sudo less
+
+# Prepare sudo and delete sudo as alias to gosu
+RUN rm -f /usr/local/bin/sudo && \
+    groupadd -r sudo && \
+    echo "%sudo  ALL=(ALL)       ALL" >> /etc/sudoers
+<% else %>
+ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y update && \
-    apt-get install -y curl git-core xz-utils build-essential wget unzip sudo gnupg2 dirmngr && \
+    apt-get install -y curl git-core xz-utils build-essential zlib1g-dev libreadline-dev libssl-dev wget unzip sudo gnupg2 dirmngr cmake pkg-config && \
     rm -rf /var/lib/apt/lists/*
+<% end %>
 
 # Add "rvm" as system group, to avoid conflicts with host GIDs typically starting with 1000
-RUN groupadd -r rvm && useradd -r -g rvm -G sudo -p "" --create-home rvm && \
-    echo "source /etc/profile.d/rvm.sh" >> /etc/rubybashrc
+RUN groupadd -r rvm && useradd -r -g rvm -G sudo -p "" --create-home rvm
+
+# Make sure rvm and later settings are available in interactive and non-interactive shells
+RUN echo "source /etc/profile.d/rvm.sh" >> /etc/rubybashrc && \
+    echo "source /etc/rubybashrc" >> /etc/bashrc && \
+    echo "source /etc/rubybashrc" >> /etc/bash.bashrc
+ENV BASH_ENV /etc/rubybashrc
+
 USER rvm
 
 RUN mkdir ~/.gnupg && \
@@ -18,16 +40,17 @@ RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A
     (curl -L http://get.rvm.io | sudo bash) && \
     bash -c " \
         source /etc/rubybashrc && \
+        rvm autolibs disable && \
         rvmsudo rvm cleanup all "
 
 # Import patch files for ruby and gems
 COPY build/patches /home/rvm/patches/
-ENV BASH_ENV /etc/rubybashrc
 
 # install rubies and fix permissions on
+ENV RVM_RUBIES 2.5.8 3.0.0
 RUN bash -c " \
     export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
-    for v in 2.5.7 ; do \
+    for v in ${RVM_RUBIES} ; do \
         rvm install \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
     done && \
     rvm cleanup all && \
@@ -38,7 +61,7 @@ RUN bash -c " \
 RUN echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
     bash -c " \
         rvm all do gem update --system --no-document && \
-        rvm all do gem install --no-document bundler 'bundler:~>1.16' rake-compiler hoe mini_portile rubygems-tasks mini_portile2 && \
+        rvm all do gem install --no-document bundler 'bundler:~>1.16' 'rake-compiler:1.1.1' 'hoe:3.20.0' mini_portile rubygems-tasks mini_portile2 && \
         find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
 
 # Install rake-compiler's cross rubies in global dir instead of /root
@@ -48,15 +71,18 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 
 # Add cross compilers for Windows and Linux
 USER root
+
+<% if platform !~ /linux/ %>
 RUN apt-get -y update && \
-    apt-get install -y moreutils <%
+    apt-get install -y <%
+if platform=~/darwin/     %> clang python lzma-dev libxml2-dev libssl-dev libc++-10-dev <% end %><%
 if platform=~/x86-mingw32/   %> gcc-mingw-w64-i686 g++-mingw-w64-i686 <% end %><%
-if platform=~/x64-mingw32/ %> gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 <% end %><%
-if platform=~/x86-linux/     %> gcc-multilib g++-multilib <% end %> && \
+if platform=~/x64-mingw32/ %> gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 <% end %> && \
     rm -rf /var/lib/apt/lists/*
+<% end %>
 
 RUN bash -c " \
-        rvm alias create default 2.5.7 && \
+        rvm alias create default 2.5.8 && \
         rvm use default "
 
 <% if platform=~/linux/   %>
@@ -66,46 +92,74 @@ RUN bash -c " \
         ruby /root/mk_i686.rb "
 <% end %>
 
-USER rvm
-
-COPY build/patches2 /home/rvm/patches/
-# Patch rake-compiler to build and install static libraries for Linux rubies
-RUN cd /usr/local/rvm/gems/ruby-2.5.7/gems/rake-compiler-1.1.0 && \
-    ( git apply /home/rvm/patches/rake-compiler-1.1.0/*.patch || true )
-RUN cd /usr/local/rvm/gems/ruby-2.5.7/gems/hoe-3.20.0 && \
-    ( git apply /home/rvm/patches/hoe-3.20.0/*.patch || true )
+<% if platform=~/darwin/ %>
+RUN git clone -q --depth=1 https://github.com/tpoechtrager/osxcross.git /opt/osxcross && rm -rf /opt/osxcross/.git && \
+    cd /opt/osxcross/tarballs && \
+    curl -L -o MacOSX11.1.sdk.tar.xz https://github.com/larskanis/MacOSX-SDKs/releases/download/11.1/MacOSX11.1.sdk.tar.xz && \
+    tar -xf MacOSX11.1.sdk.tar.xz -C . && \
+    cp -rf /usr/lib/llvm-10/include/c++ MacOSX11.1.sdk/usr/include/c++ && \
+    cp -rf /usr/include/x86_64-linux-gnu/c++/9/bits/ MacOSX11.1.sdk/usr/include/c++/v1/bits && \
+    tar -cJf MacOSX11.1.sdk.tar.xz MacOSX11.1.sdk && \
+    cd /opt/osxcross && \
+    UNATTENDED=1 SDK_VERSION=11.1 OSX_VERSION_MIN=10.13 USE_CLANG_AS=1 ./build.sh && \
+    rm -rf *~ build tarballs/*
+
+RUN echo "export PATH=/opt/osxcross/target/bin:\$PATH" >> /etc/rubybashrc && \
+    echo "export MACOSX_DEPLOYMENT_TARGET=10.13" >> /etc/rubybashrc && \
+    echo "export OSXCROSS_MP_INC=1" >> /etc/rubybashrc
+
+# Add links to build tools without target version kind of:
+#   arm64-apple-darwin-clang   =>   arm64-apple-darwin20.1-clang
+RUN rm /opt/osxcross/target/bin/*-apple-darwin-* ; \
+    find /opt/osxcross/target/bin/ -name '*-apple-darwin[0-9]*' | sort | while read f ; do d=`echo $f | sed s/darwin[0-9\.]*/darwin/`; echo $f '"$@"' | tee $d && chmod +x $d ; done
+
+# There's no objdump in osxcross but we can use llvm's
+RUN ln -s /usr/lib/llvm-10/bin/llvm-objdump /opt/osxcross/target/bin/x86_64-apple-darwin-objdump && \
+    ln -s /usr/lib/llvm-10/bin/llvm-objdump /opt/osxcross/target/bin/aarch64-apple-darwin-objdump
 
+<% end %>
 
-# Patch ruby-2.7.0 for cross build
+# Patch rake-compiler to build and install static libraries for Linux rubies
+USER rvm
+COPY build/patches2 /home/rvm/patches/
+RUN bash -c " \
+    for v in ${RVM_RUBIES} ; do \
+      cd /usr/local/rvm/gems/ruby-\$v/gems/rake-compiler-1.1.1 && \
+      echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.1.1/*.patch && \
+      ( git apply /home/rvm/patches/rake-compiler-1.1.1/*.patch || true ) && \
+      cd /usr/local/rvm/gems/ruby-\$v/gems/hoe-3.20.0 && \
+      echo applying patches to ruby-\$v /home/rvm/patches/hoe-3.20.0/*.patch && \
+      ( git apply /home/rvm/patches/hoe-3.20.0/*.patch || true ) \
+    done "
+
+# Patch rubies for cross build
 USER root
-RUN curl -SL http://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.0.tar.xz | tar -xJC /root/ && \
-    cd /root/ruby-2.7.0 && \
-    git apply /home/rvm/patches/ruby-2.7.0/*.patch && \
-    cd .. && \
-    mkdir -p /usr/local/rake-compiler/sources/ && \
-    tar cjf /usr/local/rake-compiler/sources/ruby-2.7.0.tar.bz2 ruby-2.7.0 && \
-    chown rvm /usr/local/rake-compiler -R && \
-    rm -rf /root/ruby-2.7.0
+RUN bash -c " \
+    for v in 2.7.0 3.0.0 ; do \
+      curl -SL http://cache.ruby-lang.org/pub/ruby/\${v:0:3}/ruby-\$v.tar.xz | tar -xJC /root/ && \
+      cd /root/ruby-\$v && \
+      git apply /home/rvm/patches/ruby-\$v/*.patch && \
+      cd .. && \
+      mkdir -p /usr/local/rake-compiler/sources/ && \
+      tar cjf /usr/local/rake-compiler/sources/ruby-\$v.tar.bz2 ruby-\$v && \
+      chown rvm /usr/local/rake-compiler -R && \
+      rm -rf /root/ruby-\$v ; \
+    done "
 USER rvm
 
 
-ENV XRUBIES 2.7.0 2.6.0 2.5.0 2.4.0 2.3.0 2.2.2
+ENV XRUBIES 3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0
 
-# First do downloads sequentially since they can not run in parallel
-# Then build all xruby versions in parallel
+<% strip = '-s' if platform !~ /darwin/ %>
+# Build all xruby versions in parallel
 # Then cleanup all build artifacts
-RUN for rv in $XRUBIES; do \
-        bash -c "rake-compiler prepare-sources VERSION=$rv HOST=x86_64-linux"; \
-    done; \
-    for rv in $XRUBIES; do \
-        for host in <%= target %>; do \
-            echo -n "'env MAKE=\"make V=0\" rake-compiler cross-ruby VERSION=$rv HOST=$host' " >> ~/xbuild_rubies; \
-        done; \
-    done && \
-    cat ~/xbuild_rubies; \
-    bash -c " \
-    export CFLAGS='-s -O1 -fno-omit-frame-pointer -fno-fast-math' && \
-    parallel -- $( cat ~/xbuild_rubies ) && \
+RUN bash -c " \
+    export CFLAGS='-O1 -fno-omit-frame-pointer -fno-fast-math -fstack-protector-strong <%= strip %>' && \
+    export LDFLAGS='-pipe <%= strip %>' && \
+    <%= "export LIBS='-l:libssp.a' &&" if platform =~ /mingw/ %> \
+    <%= "export CC=#{target}-clang &&" if platform =~ /darwin/ %> \
+    export MAKE='make V=1' && \
+    rake-compiler cross-ruby VERSION=$XRUBIES HOST=<%= target %> && \
     rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources && \
     find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
 
@@ -129,18 +183,9 @@ RUN find /usr/local/rake-compiler/ruby -name *msvcrt-ruby*.dll.a | while read f
 
 USER root
 
-# Add more libraries and tools to support cross build
-RUN <%
-if platform=~/x86-linux/   %> dpkg --add-architecture i386 && <% end %> \
-    apt-get -y update && \
-    apt-get install -y cmake <%
-if platform=~/x86-linux/   %> libc6-dev:i386 libudev-dev:i386 <% end %><%
-if platform=~/x86_64-linux/ %> libudev-dev <% end %> && \
-    rm -rf /var/lib/apt/lists/*
+# Fix paths in rake-compiler/config.yml
+RUN sed -i -- "s:/root/.rake-compiler:/usr/local/rake-compiler:g" /usr/local/rake-compiler/config.yml
 
-# Fix paths in rake-compiler/config.yml and add rvm and mingw-tools to the global bashrc
-RUN sed -i -- "s:/root/.rake-compiler:/usr/local/rake-compiler:g" /usr/local/rake-compiler/config.yml && \
-    echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc
 
 <% if platform=~/mingw/ %>
 # Install wrappers for strip commands as a workaround for "Protocol error" in boot2docker.
@@ -148,10 +193,6 @@ COPY build/strip_wrapper /root/
 RUN mv /usr/bin/<%= target %>-strip /usr/bin/<%= target %>-strip.bin && \
     ln /root/strip_wrapper /usr/bin/<%= target %>-strip
 
-# Don't link to winpthread.dll but link static, since the DLL is not distributed with RubyInstaller
-RUN find / -name libwinpthread.dll.a | xargs rm
-RUN find / -name libwinpthread-1.dll | xargs rm
-
 # Use posix pthread for mingw so that C++ standard library for thread could be
 # available such as std::thread, std::mutex, so on.
 # https://sourceware.org/pthreads-win32/
@@ -160,21 +201,31 @@ RUN printf "1\n" | update-alternatives --config <%= target %>-gcc && \
 <% end %>
 
 <% if platform=~/linux/ %>
-# Make the system to have GLIBC 2.12 instead of 2.23 so that
-# generated ruby package can run on CentOS 6 with GLIBC 2.12
-RUN sed -i 's/__GLIBC_MINOR__\t[0-9][0-9]/__GLIBC_MINOR__\t12/' /usr/include/features.h
+# Enable modern compiler toolset of manylinux image
+RUN echo "export PATH=\$DEVTOOLSET_ROOTPATH/usr/bin:\$PATH" >> /etc/rubybashrc
+
+# Add prefixed versions of compiler tools
+RUN for f in addr2line gcc gcov-tool ranlib ar dwp gcc-ranlib nm readelf as elfedit gcc-ar gprof objcopy size c++filt g++ gcov ld objdump strings cpp gcc-nm pkg-config strip ; do ln -sf $DEVTOOLSET_ROOTPATH/usr/bin/$f $DEVTOOLSET_ROOTPATH/usr/bin/<%= target %>-$f ; done
+
+# ruby-2.5 links to libcrypt, which isn't necessary for extensions
+RUN find /usr/local/rake-compiler/ruby -name rbconfig.rb | while read f ; do sed -i 's/-lcrypt//' $f ; done
+<% end %>
+
+<% if platform=~/arm64-darwin/ %>
+# Add a arm64 darwin target as alternative to aarch64
+RUN grep -E 'rbconfig-aarch64-darwin' /usr/local/rake-compiler/config.yml | sed 's/rbconfig-[a-z0-9_]*-darwin/rbconfig-<%= platform %>/' >> /usr/local/rake-compiler/config.yml
 <% end %>
 
 # Install SIGINT forwarder
 COPY build/sigfw.c /root/
-RUN gcc $HOME/sigfw.c -o /usr/local/bin/sigfw
+RUN gcc $HOME/sigfw.c -o /usr/bin/sigfw
 
 # Install user mapper
-COPY build/runas /usr/local/bin/
+COPY build/runas /usr/bin/
 
 # Install sudoers configuration
 COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
-ENV RUBY_CC_VERSION 2.7.0:2.6.0:2.5.0:2.4.0:2.3.0:2.2.2
+ENV RUBY_CC_VERSION 3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0
 
 CMD bash

data/History.md

@@ -1,3 +1,18 @@
+1.1.0 / 2020-12-28
+------------------
+
+* Use ManyLinux2014 as docker base image for linux targets.
+  That way compatibility to very old linux dists can be provided, while still using modern compilers.
+* Add macOS cross build targets "x86_64-darwin" and "arm64-darwin".
+  They are based on MacOSX-SDK-11.1
+* Add Ruby-3.0 as native rvm and cross ruby version.
+* Remove Ruby-2.2 from RUBY_CC_VERSION and cross rubies.
+* Update to Ubuntu-20.04 for Mingw and JRuby targets.
+* Set `ExtensionTask#no_native=true` to fix issues with cross_compiling callback not being called.
+  See discussion here: https://github.com/rake-compiler/rake-compiler/pull/171
+* Allow setting an alternative dockerhub user per `DOCKERHUB_USER`.
+
+
 1.0.1 / 2020-01-13
 ------------------
 

data/Rakefile

@@ -6,19 +6,24 @@ require_relative "build/parallel_docker_build"
 
 RakeCompilerDock::GemHelper.install_tasks
 
+DOCKERHUB_USER = ENV['DOCKERHUB_USER'] || "larskanis"
+
 namespace :build do
   platforms = [
     ["x86-mingw32", "i686-w64-mingw32"],
     ["x64-mingw32", "x86_64-w64-mingw32"],
-    ["x86-linux", "i686-linux-gnu"],
-    ["x86_64-linux", "x86_64-linux-gnu"],
+    ["x86-linux", "i686-redhat-linux"],
+    ["x86_64-linux", "x86_64-redhat-linux"],
+    ["x86_64-darwin", "x86_64-apple-darwin"],
+    ["arm64-darwin", "aarch64-apple-darwin"],
   ]
   platforms.each do |platform, target|
     sdf = "Dockerfile.mri.#{platform}"
+
     desc "Build image for platform #{platform}"
     task platform => sdf
     task sdf do
-      sh "docker build -t larskanis/rake-compiler-dock-mri-#{platform}:#{RakeCompilerDock::IMAGE_VERSION} -f Dockerfile.mri.#{platform} ."
+      sh "docker build -t #{DOCKERHUB_USER}/rake-compiler-dock-mri-#{platform}:#{RakeCompilerDock::IMAGE_VERSION} -f Dockerfile.mri.#{platform} ."
     end
 
     df = ERB.new(File.read("Dockerfile.mri.erb")).result(binding)
@@ -29,11 +34,14 @@ namespace :build do
   desc "Build image for JRuby"
   task :jruby => "Dockerfile.jruby"
   task "Dockerfile.jruby" do
-    sh "docker build -t larskanis/rake-compiler-dock-jruby:#{RakeCompilerDock::IMAGE_VERSION} -f Dockerfile.jruby ."
+    sh "docker build -t #{DOCKERHUB_USER}/rake-compiler-dock-jruby:#{RakeCompilerDock::IMAGE_VERSION} -f Dockerfile.jruby ."
   end
 
   RakeCompilerDock::ParallelDockerBuild.new(platforms.map{|pl, _| "Dockerfile.mri.#{pl}" } + ["Dockerfile.jruby"], workdir: "tmp/docker")
 
+  desc "Build images for all MRI platforms in parallel"
+  multitask :mri => platforms.map(&:first)
+
   desc "Build images for all platforms in parallel"
   multitask :all => platforms.map(&:first) + ["jruby"]
 end

data/build/patches/{ruby-2.7.0 → ruby-3.0.0}/no_sendfile.patch

@@ -11,14 +11,14 @@ index ebe3d8c..a336b73 100755
 
  fi
 diff --git a/io.c b/io.c
-index 82c5940538..a8d3661ec8 100644
+index 48592ac51a..2635ac8ec6 100644
 --- a/io.c
 +++ b/io.c
-@@ -10721,7 +10721,6 @@ nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
+@@ -11111,6 +11111,7 @@ nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
+     return 0;
  }
 
- #if defined HAVE_COPY_FILE_RANGE || (defined __linux__ && defined __NR_copy_file_range)
--#  define USE_COPY_FILE_RANGE
- #endif
-
++#undef USE_COPY_FILE_RANGE
  #ifdef USE_COPY_FILE_RANGE
+
+ static ssize_t

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

@@ -0,0 +1,214 @@
+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/0004-Enable-build-of-static-libruby.patch

@@ -0,0 +1,29 @@
+diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
+index 8edf5cd..5d25b82 100644
+--- a/tasks/bin/cross-ruby.rake
++++ b/tasks/bin/cross-ruby.rake
+@@ -116,11 +116,22 @@ RUBY_CC_VERSIONS.split(":").each do |ruby_cc_version|
+         "--host=#{mingw_host}",
+         "--target=#{mingw_target}",
+         "--build=#{RUBY_BUILD}",
+-        '--enable-shared',
++        '--enable-install-static-library',
++        '--disable-jit-support',
+         '--disable-install-doc',
+         '--with-ext=',
+-        'LDFLAGS=-pipe -s',
+       ]
++      if mingw_host=~/darwin/
++        options += [
++          '--enable-static',
++          '--disable-shared',
++        ]
++      else
++        options += [
++          '--enable-static',
++          '--enable-shared',
++        ]
++      end
+
+       # Force Winsock2 for Ruby 1.8, 1.9 defaults to it
+       options << "--with-winsock2" if major == "1.8"

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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,26 @@
+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-3.0.0/ruby2_keywords.patch

@@ -0,0 +1,15 @@
+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/runas

@@ -9,6 +9,7 @@ ln -s /usr/local/rake-compiler "$HOME"/.rake-compiler
 mkdir -p "$HOME"/.gem
 chown "$USER" "$HOME"/.gem
 
-sudo -u "$USER" --set-home \
+/usr/bin/sudo -u "$USER" -H \
     BASH_ENV=/etc/rubybashrc \
+    RAKE_EXTENSION_TASK_NO_NATIVE=true \
     -- "$@"

data/build/sudoers

@@ -1 +1 @@
-Defaults        env_keep += "http_proxy https_proxy ftp_proxy GEM_PRIVATE_KEY_PASSPHRASE RCD_HOST_RUBY_PLATFORM RCD_HOST_RUBY_VERSION RCD_IMAGE RUBY_CC_VERSION"
+Defaults        env_keep += "http_proxy https_proxy ftp_proxy GEM_PRIVATE_KEY_PASSPHRASE RCD_HOST_RUBY_PLATFORM RCD_HOST_RUBY_VERSION RCD_IMAGE RUBY_CC_VERSION LD_LIBRARY_PATH DEVTOOLSET_ROOTPATH"

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "1.0.1"
-  IMAGE_VERSION = "1.0.0"
+  VERSION = "1.1.0"
+  IMAGE_VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+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==
+  -----END CERTIFICATE-----
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,15 +95,16 @@ files:
 - build/gem_helper.rb
 - 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/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.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/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/runas
 - build/sigfw.c
 - build/strip_wrapper
@@ -116,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows

metadata.gz.sig

@@ -0,0 +1,2 @@
+
+� ;�&%$xu�Q�����G�A�Ơ�9r\ZA�'g

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/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
-