rake-compiler-dock 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c4b1e01bfda55a4667b92493a41b27893b83c670455e1ffe0238bf123498d8
-  data.tar.gz: ed349a2d99f6615ba3dabc237580c72a1eb9461651dfd3e11b759176f4a4f46d
+  metadata.gz: d8defac75bbfdcb50e87c34ae26c04eeac94d56144481a01ea096cffe70f33ac
+  data.tar.gz: 5fe13b2f51bea09bb8ed3f02c170ccf2984aa6fcd74bed05b74643d658a0d615
 SHA512:
-  metadata.gz: 2dab2d0f3d3b0e616b7c5f8c410d9a66a917b5ee64cb2773cafabffae10b1ff586caadba926395c02ee64dbf30a4831819f6ac50638a315a4593aea96a5eeb06
-  data.tar.gz: 7b75f6e253400bc5314b547021889ad4e06a83338a3a9bf66de2c453774b81e0e03b6fd744f7c5961869c9959dcb03b46371d8535c54d1a3b16786d81abe85ea
+  metadata.gz: 94bb24cf349bc6099fc6dd07ffe860588a782ef0408af57c59001a4100a5be568489e7d8610a840949590086289a474c123be34da1193633c7ba6aaff733c2fb
+  data.tar.gz: 2123aa6ccb22c06ee123e58eb34e306a0f8e5b69e57fd6124b1bfe7cdd42a5f2a83a0b7c6ce63015e7c02f706f011bd46a1b0e56b823d86997a702fa7ab57525

data/.github/workflows/ci.yml

@@ -187,9 +187,10 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: gem-${{ matrix.platform }}
+      - if: matrix.rubygems
+        run: gem update --system ${{ matrix.rubygems }}
       - name: Test gem-${{ matrix.platform }}
         run: |
-          gem update --system ${{ matrix.rubygems }}
           gem install --local *.gem --verbose
           cd test/rcd_test/
           bundle install
@@ -250,7 +251,7 @@ jobs:
           docker run --rm -v $PWD:/work -w /work \
             ${{ matrix.docker_platform}} ruby:${{ matrix.ruby }}${{ matrix.docker_tag }} \
             sh -c "
-              gem update --system ${{ matrix.rubygems }} &&
+              if test -n '${{ matrix.rubygems }}' ; then gem update --system ${{ matrix.rubygems }} ; fi &&
               gem install --local *.gem --verbose &&
               cd test/rcd_test/ &&
               bundle install &&

data/Dockerfile.jruby

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

data/Dockerfile.mri.erb

@@ -10,28 +10,6 @@ RUN apt-get -y update && \
     apt-get install -y autoconf cmake pkg-config zlib1g-dev libreadline-dev libsqlite0-dev libssl-dev libyaml-dev libffi-dev && \
     rm -rf /var/lib/apt/lists/*
 
-##
-##  install rbenv and ruby-build
-##
-RUN groupadd -r rubyuser && useradd -r -g rubyuser -G sudo -p "" --create-home rubyuser
-
-ENV RBENV_ROOT=/usr/local/rbenv RBENV_RUBIES="2.5.9 3.1.3"
-
-# chown after running `rbenv init` because that command creates some subdirectories
-RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
-    git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
-    \
-    echo "export RBENV_ROOT=/usr/local/rbenv" >> /etc/rubybashrc && \
-    echo "export PATH=$RBENV_ROOT/bin:\$PATH" >> /etc/rubybashrc && \
-    $RBENV_ROOT/bin/rbenv init - --no-rehash bash >> /etc/rubybashrc && \
-    echo "source /etc/rubybashrc" >> /etc/bashrc && \
-    echo "source /etc/rubybashrc" >> /etc/bash.bashrc && \
-    \
-    chown -R rubyuser:rubyuser ${RBENV_ROOT} && \
-    find ${RBENV_ROOT} -type d -print0 | sudo xargs -0 chmod g+sw
-ENV BASH_ENV=/etc/rubybashrc
-
-
 ##
 ## Install cross compilers
 ##
@@ -69,11 +47,35 @@ RUN /tmp/mk_osxcross.sh
 <% end %>
 
 
+##
+##  install rbenv and ruby-build
+##
+RUN groupadd -r rubyuser && useradd -r -g rubyuser -G sudo -p "" --create-home rubyuser
+
+ENV RBENV_ROOT=/usr/local/rbenv
+
+# chown after running `rbenv init` because that command creates some subdirectories
+RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
+    git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
+    \
+    echo "export RBENV_ROOT=/usr/local/rbenv" >> /etc/rubybashrc && \
+    echo "export PATH=$RBENV_ROOT/bin:\$PATH" >> /etc/rubybashrc && \
+    $RBENV_ROOT/bin/rbenv init - --no-rehash bash >> /etc/rubybashrc && \
+    echo "source /etc/rubybashrc" >> /etc/bashrc && \
+    echo "source /etc/rubybashrc" >> /etc/bash.bashrc && \
+    \
+    chown -R rubyuser:rubyuser ${RBENV_ROOT} && \
+    find ${RBENV_ROOT} -type d -print0 | sudo xargs -0 chmod g+sw
+ENV BASH_ENV=/etc/rubybashrc
+
+
 ##
 ##  set up rake-compiler and install bootstrap rubies
 ##
 USER rubyuser
 
+ENV RBENV_RUBIES="2.5.9 3.1.6"
+
 # Install the bootstrap rubies
 RUN bash -c " \
       echo 'gem: --no-ri --no-rdoc --no-document' >> ~/.gemrc && \
@@ -91,7 +93,9 @@ RUN bash -c " \
         rbenv shell \$v && \
         gem install rake-compiler -v1.2.9 && \
         cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
-        patch -p1 < /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; \
+        for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
+          patch -p1 < \$patch ; \
+        done \
       done \
     "
 
@@ -110,19 +114,19 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 #
 xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
   [
-    # Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
-    ["3.4.1:3.3.5:3.2.0:3.1.0", "3.1.3"],
+    # Rubyinstaller-3.1+ is platform x64-mingw-ucrt
+    ["3.4.1:3.3.5:3.2.6:3.1.6", "3.1.6"],
   ]
 elsif platform =~ /x64-mingw32/
   [
-    # Rubyinstaller prior to 3.1.0 is platform x64-mingw32
-    ["2.6.0:2.5.0:2.4.0", "2.5.9"],
-    ["3.0.0:2.7.0", "3.1.3"],
+    # Rubyinstaller prior to 3.1 is platform x64-mingw32
+    ["2.6.10:2.5.9:2.4.10", "2.5.9"],
+    ["3.0.7:2.7.8", "3.1.6"],
   ]
 else
   [
-    ["2.6.0:2.5.0:2.4.0", "2.5.9"],
-    ["3.4.1:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
+    ["2.6.10:2.5.9:2.4.10", "2.5.9"],
+    ["3.4.1:3.3.5:3.2.6:3.1.6:3.0.7:2.7.8", "3.1.6"],
   ]
 end
 
@@ -165,12 +169,15 @@ RUN find /usr/local/rake-compiler/ruby -name lib*-ruby*.dll.a | while read f ; d
 RUN find /usr/local/rake-compiler/ruby -name rbconfig.rb | while read f ; do sed -i 's/-lcrypt//' $f ; done
 
 <% if platform =~ /darwin/ %>
-# ruby-3.2+ on darwin links with `-bundle_loader`,
-# - see https://github.com/rake-compiler/rake-compiler-dock/issues/87
-# - note that we do this for "3.[2-9].0" to match rubies 3.2 and later
-# - and we add a "*" on the end for "3.[2-9].0*" to match prereleases like "3.3.0+0"
-RUN find /usr/local/rake-compiler/ruby/*/*/lib/ruby/3.[2-9].0* -name rbconfig.rb | \
-    while read f ; do sed -i 's/\["EXTDLDFLAGS"\] = "/&-Wl,-flat_namespace /' $f ; done
+# for rubies which use `-bundle_loader` on darwin
+# - the upstream change: https://github.com/ruby/ruby/pull/6193
+# - how we got to this solution: https://github.com/rake-compiler/rake-compiler-dock/issues/87
+#
+# note that ruby/ruby#6193 was backported to 2.7.7, 3.0.5, and 3.1.3
+# - see https://github.com/rake-compiler/rake-compiler-dock/issues/134 for more notes
+RUN find /usr/local/rake-compiler/ruby/*/*/lib/ruby -name rbconfig.rb | while read f ; do \
+      sed -E -i 's/(\["EXTDLDFLAGS"\] = ".*)(-bundle_loader)/\1-Wl,-flat_namespace \2/' $f ; \
+    done
 <% end %>
 
 
@@ -216,8 +223,8 @@ RUN echo 'source /etc/profile.d/rcd-env.sh' >> /etc/rubybashrc
 # Install sudoers configuration
 COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
-RUN bash -c "rbenv global 3.1.3"
+RUN bash -c "rbenv global 3.1.6"
 
-ENV RUBY_CC_VERSION=3.4.1:3.3.5:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
+ENV RUBY_CC_VERSION=3.4.1:3.3.5:3.2.6:3.1.6:3.0.7:2.7.8:2.6.10:2.5.9:2.4.10
 
 CMD bash

data/History.md

@@ -1,5 +1,19 @@
 # `rake-compiler/rake-compiler-dock` Changelog
 
+## v1.8.0 / 2025-01-05
+
+### Notable changes
+
+All versions of Ruby in the build containers are the latest patch version. #135 @flavorjones
+- `RUBY_CC_VERSION=3.4.1:3.3.5:3.2.6:3.1.6:3.0.7:2.7.8:2.6.10:2.5.9:2.4.10`
+
+### Other changes
+
+- Base ruby updated to v3.1.6 (from v3.1.3), which is now the default `rbenv` ruby.
+- (Darwin) Set `OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1` to successfully build the 3.0 series.
+- (Darwin) The linker flags include `-Wl,-flat_namespace` for 2.7, 3.0, 3.1, 3.2, 3.3, and 3.4 rubies. Previously this was only needed for 3.2+, but code backported to 2.7.7, 3.0.5, and 3.1.3 required it for those versions as well.
+
+
 ## v1.7.1 / 2025-01-03
 
 - Bump rake-compiler dependency to v1.2.9 (from v1.2.5).

data/build/mk_osxcross.sh

@@ -27,6 +27,8 @@ rm -rf *~ build tarballs/*
 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
+echo "export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1" >> /etc/rubybashrc
+
 
 # Add links to build tools without target version kind of:
 #   arm64-apple-darwin-clang   =>   arm64-apple-darwin20.1-clang

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

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

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "1.7.1"
-  IMAGE_VERSION = "1.7.1"
+  VERSION = "1.8.0"
+  IMAGE_VERSION = "1.8.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Lars Kanis
 bindir: bin
 cert_chain: []
-date: 2025-01-03 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - build/mk_pkg_config.sh
 - build/parallel_docker_build.rb
 - build/patches/rake-compiler-1.2.9/0004-Enable-build-of-static-libruby.patch
+- build/patches/rake-compiler-1.2.9/0005-build-miniruby-first.patch
 - build/rcd-env.sh
 - build/runas
 - build/sigfw.c