rake-compiler-dock 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4bd88acec0b242f927021220f31a29ba3b6d2430684939cca547f166a2e4cbf
-  data.tar.gz: 93bc3f64149ddde490bc346ada8fc8ad08d1a726d7a1d0a30e7fac53de796c35
+  metadata.gz: d8defac75bbfdcb50e87c34ae26c04eeac94d56144481a01ea096cffe70f33ac
+  data.tar.gz: 5fe13b2f51bea09bb8ed3f02c170ccf2984aa6fcd74bed05b74643d658a0d615
 SHA512:
-  metadata.gz: 8a6cc4bab3dab8d51451f3a813252c37118c946d5de6d484ba3a352780c2303ea90c2db0dc4d8f9e67164a3ac4f47f5a8ca5f9198ff2c145b41811f374bff079
-  data.tar.gz: c2feaa279b28ef3b4b058f86a6ac37df9dd7356d3f8c119bba279689460e981d008424af5272d5287064f8b4322b2fb7a7d9aba5cd66ccdd8fe855261cf13a78
+  metadata.gz: 94bb24cf349bc6099fc6dd07ffe860588a782ef0408af57c59001a4100a5be568489e7d8610a840949590086289a474c123be34da1193633c7ba6aaff733c2fb
+  data.tar.gz: 2123aa6ccb22c06ee123e58eb34e306a0f8e5b69e57fd6124b1bfe7cdd42a5f2a83a0b7c6ce63015e7c02f706f011bd46a1b0e56b823d86997a702fa7ab57525

data/.github/workflows/ci.yml

@@ -144,7 +144,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
+        ruby: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -169,7 +169,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [x86_64-linux, x86_64-linux-gnu]
-        ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
+        ruby: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
         include:
           # declare rubygems for each ruby version
           - { ruby: "3.0", rubygems: "3.5.23" }
@@ -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
@@ -214,7 +215,7 @@ jobs:
           - x86_64-linux
           - x86_64-linux-gnu
           - x86_64-linux-musl
-        ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
+        ruby: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
         include:
           # declare rubygems for each ruby version
           - { ruby: "3.0", rubygems: "3.5.23" }
@@ -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 &&
@@ -264,7 +265,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-13, macos-14]
-        ruby: ["3.4.0-rc1", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
+        ruby: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
         exclude:
           # setup-ruby does not provide ruby 2.4 or 2.5 on arm64-darwin as of 2024-05-01
           - os: macos-14
@@ -304,7 +305,7 @@ jobs:
             ruby: "3.3"
             platform: x64-mingw-ucrt
           - os: windows-latest
-            ruby: "head" # "3.4.0-rc1" not available yet on windows
+            ruby: "3.4"
             platform: x64-mingw-ucrt
     runs-on: ${{ matrix.os }}
     steps:
@@ -359,7 +360,7 @@ jobs:
             ruby: "3.3"
             platform: x64-mingw-ucrt
           - os: windows-latest
-            ruby: "head" # "3.4.0-rc1" not available yet on windows
+            ruby: "3.4"
             platform: x64-mingw-ucrt
     runs-on: ${{ matrix.os }}
     steps:

data/.github/workflows/publish-images.yml

@@ -39,7 +39,7 @@ jobs:
             ${{runner.os}}-${{matrix.platform}}-buildx
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: "3.3"
           bundler-cache: true
       - name: Generate docker image names
         id: rcd_config

data/.github/workflows/release-images.yml

@@ -0,0 +1,87 @@
+name: Release docker images to GHCR
+concurrency:
+  group: "${{github.workflow}}-${{github.ref}}"
+  cancel-in-progress: true
+
+#
+#  This workflow assumes the maintainer has chosen the appropriate tag in the workflow dispatch UI.
+#
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Tag name to release"
+        required: true
+
+jobs:
+  build:
+    name: "build ${{ inputs.tag }} ${{ matrix.platform }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - aarch64-linux-gnu
+          - aarch64-linux-musl
+          - arm-linux-gnu
+          - arm-linux-musl
+          - arm64-darwin
+          - jruby
+          - x64-mingw-ucrt
+          - x64-mingw32
+          - x86-linux-gnu
+          - x86-linux-musl
+          - x86-mingw32
+          - x86_64-darwin
+          - x86_64-linux-gnu
+          - x86_64-linux-musl
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.tag }}
+      - name: Use cache from primary pipeline
+        uses: actions/cache@v4
+        with:
+          path: tmp/build-cache
+          key: ${{runner.os}}-${{matrix.platform}}-buildx-${{github.sha}}
+          restore-keys: |
+            ${{runner.os}}-${{matrix.platform}}-buildx
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+          bundler-cache: true
+      - name: Generate docker image names
+        id: rcd_config
+        run: |
+          bundle exec ruby -e ' \
+            require "rake_compiler_dock"; \
+            print "image_name="; \
+            puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}})); \
+            if %q(${{matrix.platform}}).end_with?("-gnu"); \
+              print "generic_linux_image_name="; \
+              puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}})).chomp("-gnu"); \
+            end \
+          ' | tee -a $GITHUB_OUTPUT
+      - name: Build docker image
+        env:
+          RCD_DOCKER_BUILD: docker buildx build --cache-from=type=local,src=tmp/build-cache --cache-to=type=local,dest=tmp/build-cache-new --load
+        run: |
+          docker buildx create --driver docker-container --use
+          bundle exec rake build:${{matrix.platform}}
+          # move build cache and remove outdated layers
+          rm -rf tmp/build-cache
+          mv tmp/build-cache-new tmp/build-cache
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
+      - name: Push the docker image
+        run: |
+          docker images
+          docker push ${{steps.rcd_config.outputs.image_name}}
+      - name: Push a generic linux image
+        if: ${{ steps.rcd_config.outputs.generic_linux_image_name }}
+        run: |
+          docker tag ${{steps.rcd_config.outputs.image_name}} ${{steps.rcd_config.outputs.generic_linux_image_name}}
+          docker push ${{steps.rcd_config.outputs.generic_linux_image_name}}

data/CONTRIBUTING.md

@@ -7,17 +7,28 @@ This document is intended for the rake-compiler-dock contributors.
 - prep
   - [ ] make sure CI is green!
   - [ ] update `History.md` and `lib/rake_compiler_dock/version.rb`
-- build
-  - [ ] run the steps below to generate the images locally
-  - [ ] run `gem build rake-compiler-dock`
-  - [ ] create a git tag
-- push
-  - [ ] run `bundle exec rake release:images`
-  - [ ] run `gem push pkg/rake-compiler-dock*gem`
-  - [ ] run `git push && git push --tags`
+  - [ ] commit and create a git tag
+- option 1: build locally
+  - build
+    - [ ] run the steps below to generate the images locally
+    - [ ] run `gem build rake-compiler-dock`
+  - push
+    - [ ] run `bundle exec rake release:images`
+    - [ ] run `gem push pkg/rake-compiler-dock*gem`
+    - [ ] run `git push && git push --tags`
+- option 2: build with github actions
+  - build and push images from github actions
+    - [ ] run `git push && git push --tags`
+    - [ ] wait for CI to go green on the tag
+    - [ ] go to the [release-images pipeline][] and run the workflow on the tag
+  - build the gem locally and push it
+    - [ ] locally, run `gem build rake-compiler-dock`
+    - [ ] run `gem push pkg/rake-compiler-dock*gem`
 - announce
   - [ ] create a release at https://github.com/rake-compiler/rake-compiler-dock/releases
 
+[release-images pipeline]: https://github.com/rake-compiler/rake-compiler-dock/actions/workflows/release-images.yml
+
 
 ## Building a versioned image
 

data/Dockerfile.jruby

@@ -44,13 +44,15 @@ RUN bash -c " \
     "
 
 # Install rake-compiler and patch it to build and install static libraries for Linux rubies
-COPY build/patches2 /home/rubyuser/patches
+COPY build/patches /home/rubyuser/patches
 RUN bash -c " \
       for v in ${RBENV_RUBIES} ; do \
         rbenv shell \$v && \
-        gem install rake-compiler -v1.2.5 && \
-        cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.5 && \
-        patch -p1 < /home/rubyuser/patches/rake-compiler-1.2.5/*.patch ; \
+        gem install rake-compiler -v1.2.9 && \
+        cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
+        for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
+          patch -p1 < \$patch ; \
+        done \
       done \
     "
 

data/Dockerfile.mri.erb

@@ -10,39 +10,17 @@ 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
 ##
 <% if platform =~ /x64-mingw-ucrt/ %>
 COPY --from=larskanis/mingw64-ucrt:20.04 \
-    /build/binutils-mingw-w64-x86-64_2.34-6ubuntu1.3+8.8_amd64.deb \
-    /build/g++-mingw-w64-x86-64_9.3.0-17ubuntu1~20.04+22~exp1ubuntu4_amd64.deb \
-    /build/gcc-mingw-w64-base_9.3.0-17ubuntu1~20.04+22~exp1ubuntu4_amd64.deb \
-    /build/gcc-mingw-w64-x86-64_9.3.0-17ubuntu1~20.04+22~exp1ubuntu4_amd64.deb \
-    /build/mingw-w64-common_7.0.0-2_all.deb \
-    /build/mingw-w64-x86-64-dev_7.0.0-2_all.deb \
+    /build/binutils-mingw-w64-x86-64_*.deb \
+    /build/g++-mingw-w64-x86-64_*.deb \
+    /build/gcc-mingw-w64-base_*.deb \
+    /build/gcc-mingw-w64-x86-64_*.deb \
+    /build/mingw-w64-common_*.deb \
+    /build/mingw-w64-x86-64-dev_*.deb \
     /debs/
 RUN dpkg -i /debs/*.deb
 
@@ -57,6 +35,7 @@ if platform =~ /darwin/            %> clang python lzma-dev libxml2-dev libssl-d
 if platform =~ /aarch64-linux-gnu/ %> gcc-aarch64-linux-gnu g++-aarch64-linux-gnu <% end %><%
 if platform =~ /arm-linux-gnu/     %> gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf <% end %><%
 if platform =~ /x86-linux-gnu/     %> gcc-i686-linux-gnu g++-i686-linux-gnu <% end %><%
+if platform =~ /x86_64-linux-gnu/  %> gcc-x86-64-linux-gnu g++-x86-64-linux-gnu <% 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 %> && \
     rm -rf /var/lib/apt/lists/*
@@ -68,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 && \
@@ -84,13 +87,15 @@ RUN bash -c " \
     "
 
 # Install rake-compiler and patch it to build and install static libraries for Linux rubies
-COPY build/patches2 /home/rubyuser/patches
+COPY build/patches /home/rubyuser/patches
 RUN bash -c " \
       for v in ${RBENV_RUBIES} ; do \
         rbenv shell \$v && \
-        gem install rake-compiler -v1.2.5 && \
-        cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.5 && \
-        patch -p1 < /home/rubyuser/patches/rake-compiler-1.2.5/*.patch ; \
+        gem install rake-compiler -v1.2.9 && \
+        cd ${RBENV_ROOT}/versions/\$v/lib/ruby/gems/*/gems/rake-compiler-1.2.9 && \
+        for patch in /home/rubyuser/patches/rake-compiler-1.2.9/*.patch ; do \
+          patch -p1 < \$patch ; \
+        done \
       done \
     "
 
@@ -109,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.0: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.0: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
 
@@ -148,7 +153,7 @@ RUN bash -c " \
 RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby.so | xargs rm
 RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby-static.a | while read f ; do cp $f `echo $f | sed s/-static//` ; done
 RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby.a | while read f ; do ar t $f | xargs ar d $f ; done
-RUN find /usr/local/rake-compiler/ruby/*linux*/ -name mkmf.rb | while read f ; do sed -i ':a;N;$!ba;s/TRY_LINK = [^\n]*\n[^\n]*\n[^\n]*LOCAL_LIBS)/& -lruby-static -lpthread -lrt -ldl <% if platform =~ /x86_64/ %> -lcrypt <% if platform !~ /musl/ %> -lz <% end %> <% end %>/' $f ; done
+RUN find /usr/local/rake-compiler/ruby/*linux*/ -name mkmf.rb | while read f ; do sed -i ':a;N;$!ba;s/TRY_LINK = [^\n]*\n[^\n]*\n[^\n]*LOCAL_LIBS)/& -lruby-static -lpthread -lrt -ldl/' $f ; done
 <% end %>
 
 <% if platform =~ /mingw/ %>
@@ -164,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 %>
 
 
@@ -215,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.0: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,25 @@
 # `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).
+- Bump Ruby to v3.4.1 (from v3.4.0) to address `ruby_abi_version` issues.
+
+
 ## v1.7.0 / 2024-12-25
 
 ### Ruby 3.4 support

data/build/mk_osxcross.sh

@@ -13,7 +13,7 @@ set -x
 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
+cp -rf /usr/include/*-linux-gnu/c++/9/bits/ MacOSX11.1.sdk/usr/include/c++/v1/bits
 tar -cJf MacOSX11.1.sdk.tar.xz MacOSX11.1.sdk
 
 set +x
@@ -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/{patches2/rake-compiler-1.2.5 → patches/rake-compiler-1.2.9}/0004-Enable-build-of-static-libruby.patch

@@ -2,13 +2,16 @@ diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
 index 8317a2a3..8ed21718 100644
 --- a/tasks/bin/cross-ruby.rake
 +++ b/tasks/bin/cross-ruby.rake
-@@ -116,11 +116,27 @@
+@@ -116,11 +116,30 @@
          "--host=#{mingw_host}",
          "--target=#{mingw_target}",
          "--build=#{RUBY_BUILD}",
 -        '--enable-shared',
 +        '--enable-install-static-library',
 +        '--disable-jit-support',
++        'ac_cv_lib_z_uncompress=no',
++        'ac_cv_lib_crypt_crypt=no',
++        'ac_cv_func_crypt_r=no',
          '--disable-install-doc',
          '--with-ext=',
        ]

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.0"
-  IMAGE_VERSION = "1.7.0"
+  VERSION = "1.8.0"
+  IMAGE_VERSION = "1.8.0"
 end

data/mingw64-ucrt/Dockerfile

@@ -32,7 +32,7 @@ RUN cd mingw-w64-* && \
 
 # Install UCRT enabled deb-packages
 RUN dpkg -i mingw-w64-common_7.0.0-2_all.deb \
-    mingw-w64-tools_7.0.0-2_amd64.deb \
+    mingw-w64-tools_7.0.0-2_*.deb \
     mingw-w64-x86-64-dev_7.0.0-2_all.deb
 
 # Download gcc-binutils sources for mingw
@@ -52,6 +52,10 @@ RUN apt-get source gcc-mingw-w64 && \
     cd gcc-mingw-w64-* && \
     mk-build-deps -ir -t "apt-get -o Debug::pkgProblemResolver=yes -y --no-install-recommends"
 
+# Add version based alias
+RUN ln -s `which autoconf` `which autoconf`2.69 && \
+    ln -s `which autom4te` `which autom4te`2.69
+
 # Build gcc (only C and C++) based on UCRT headers and crt
 ADD gcc-mingw-w64-*.patch ./
 RUN cd gcc-mingw-w64-* && \

data/mingw64-ucrt/README.md

@@ -0,0 +1,58 @@
+Docker image with compilers for ruby platform x64-mingw-ucrt
+------------------
+
+This Dockerfile builds compilers for Windows UCRT target.
+It takes the mingw compiler provided by Debian/Ubuntu and configures and compiles them for UCRT.
+Outputs are *.deb files of binutils, gcc and g++.
+Rake-compiler-dock reads them from this image as part of its build process for the x64-mingw-ucrt platform.
+
+The image is provided for arm64 and amd64 architectures.
+They are built by the following command:
+
+```sh
+docker buildx build . -t larskanis/mingw64-ucrt:20.04 --platform linux/arm64,linux/amd64 --push
+```
+
+
+Create builder instance for two architectures
+------------------
+
+Building with qemu emulation fails currently with a segfault, so that it must be built by a builder instance with at least one remote node for the other architecture.
+Building on native hardware is also much faster (~30 minutes) than on qemu.
+A two-nodes builder requires obviously a ARM and a Intel/AMD device.
+It can be created like this:
+
+```sh
+# Make sure the remote instance can be connected
+$ docker -H ssh://isa info
+
+# Create a new builder with the local instance
+$ docker buildx create --name isayoga
+
+# Add the remote instance
+$ docker buildx create --name isayoga --append ssh://isa
+
+# They are inactive from the start
+$ docker buildx ls
+NAME/NODE      DRIVER/ENDPOINT                   STATUS     BUILDKIT   PLATFORMS
+isayoga        docker-container
+ \_ isayoga0    \_ unix:///var/run/docker.sock   inactive
+ \_ isayoga1    \_ ssh://isa                     inactive
+default*       docker
+ \_ default     \_ default                       running    v0.13.2    linux/arm64
+
+# Bootstrap the instances
+$ docker buildx inspect --bootstrap --builder isayoga
+
+# Set the new builder as default
+$ docker buildx use isayoga
+
+# Now it should be default and in state "running"
+$ docker buildx ls
+NAME/NODE      DRIVER/ENDPOINT                   STATUS    BUILDKIT   PLATFORMS
+isayoga*       docker-container
+ \_ isayoga0    \_ unix:///var/run/docker.sock   running   v0.18.2    linux/arm64
+ \_ isayoga1    \_ ssh://isa                     running   v0.18.2    linux/amd64, linux/amd64/v2, linux/amd64/v3, linux/386
+default        docker
+ \_ default     \_ default                       running   v0.13.2    linux/arm64
+```

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Lars Kanis
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-25 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +70,7 @@ files:
 - ".dockerignore"
 - ".github/workflows/ci.yml"
 - ".github/workflows/publish-images.yml"
+- ".github/workflows/release-images.yml"
 - ".gitignore"
 - CONTRIBUTING.md
 - Dockerfile.jruby
@@ -87,7 +87,8 @@ files:
 - build/mk_osxcross.sh
 - build/mk_pkg_config.sh
 - build/parallel_docker_build.rb
-- build/patches2/rake-compiler-1.2.5/0004-Enable-build-of-static-libruby.patch
+- 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
@@ -101,6 +102,7 @@ files:
 - lib/rake_compiler_dock/starter.rb
 - lib/rake_compiler_dock/version.rb
 - mingw64-ucrt/Dockerfile
+- mingw64-ucrt/README.md
 - 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
@@ -125,7 +127,6 @@ homepage: https://github.com/rake-compiler/rake-compiler-dock
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,8 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows
   and Linux binary gems.