rake-compiler-dock 1.0.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfdfefd55e7a9101359d39e3aaed0e8a63c046b0a1952efe5d291032b582b37
-  data.tar.gz: cc50befca4c133b28bc13834a1c619250bd1aa4d7743e95fcfef47cd62330082
+  metadata.gz: 99e2b1ce6f914bd9b6449320d1c65bb5ac3cdd7f9afcf0189ee15a48e0bd8aac
+  data.tar.gz: 661f6b93c01a36993f89f121d1316d999c3e2f61fa7d577660a1e9d6a5898ff4
 SHA512:
-  metadata.gz: 8ed46ae89b00549dba2a66a7b079e2d7977f4031fcf38658f4f030bf6923a1b7e49da02986635766f7d0bd86a1bf4ff7f6252ea2d6d79dba86c00488e2a928fe
-  data.tar.gz: 193b8d63b2d747f652dd33e10b7c7c950ad92b46eff8067dfe14f11a18b126d90049dc7ea1ec57689f6fe3a38eb3358e8e3f8ffdf50dcbe3bdfb41b6d8db1886
+  metadata.gz: 3a4639688aeeb8c3b6d0142fadcf6c088f86f3672aca2873df1af672b22b7cff93245905ac6b00aac0c4467f495a5df6d9309f3660bbf27ee8f98d3dc47d8b92
+  data.tar.gz: bbc042289e0ad041c42a5b6fd13ee55930546535505e59d310c11d7b9a0130718f5c84f78bc6b539437b58e1329ad2a5a2e082125fffeefd40f6173df739eab1

data/.github/workflows/ci.yml

@@ -0,0 +1,168 @@
+name: Build docker images
+concurrency:
+  group: "${{github.workflow}}-${{github.ref}}"
+  cancel-in-progress: true
+on: [push, pull_request]
+
+jobs:
+  # These jobs use Buildx layer caching
+  docker_build:
+    name: Build
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: x86-mingw32
+          - platform: x64-mingw-ucrt
+          - platform: x64-mingw32
+          - platform: x86-linux
+          - platform: x86_64-linux
+          - platform: x86_64-darwin
+          - platform: arm64-darwin
+          - platform: arm-linux
+          - platform: aarch64-linux
+          - platform: jruby
+
+    runs-on: ubuntu-latest
+    env:
+      PLATFORM: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        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.0"
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - name: Build docker image
+        run: |
+          docker buildx create --driver docker-container --use
+          bundle exec rake build:${PLATFORM} RCD_DOCKER_BUILD="docker buildx build --cache-from=type=local,src=tmp/build-cache --cache-to=type=local,dest=tmp/build-cache-new --load"
+
+      - name: Move build cache and remove outdated layers
+        run: |
+          rm -rf tmp/build-cache
+          mv tmp/build-cache-new tmp/build-cache
+
+      - name: Build rcd_test.gem
+        run: |
+          gem build rake-compiler-dock.gemspec
+          gem install -l rake-compiler-dock-*.gem
+          cd test/rcd_test/
+          bundle install
+          bundle exec rake gem:${PLATFORM}
+
+      - name: Upload binary gem
+        uses: actions/upload-artifact@v2
+        with:
+          name: gem-${{ matrix.platform }}
+          path: test/rcd_test/pkg/*-*-*.gem
+
+      - name: Upload source gem
+        uses: actions/upload-artifact@v2
+        if: matrix.platform == 'jruby'
+        with:
+          name: gem-ruby
+          path: test/rcd_test/pkg/*-?.?.?.gem
+
+
+  job_test_native:
+    name: Test
+    needs: docker_build
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows
+            ruby: "3.0"
+            platform: x64-mingw32
+          - os: windows
+            ruby: "2.4"
+            platform: x64-mingw32
+          - os: macos
+            ruby: "3.0"
+            platform: x86_64-darwin
+          - os: macos
+            ruby: "2.4"
+            platform: x86_64-darwin
+          - os: ubuntu
+            ruby: "3.0"
+            platform: x86_64-linux
+          - os: ubuntu
+            ruby: "2.4"
+            platform: x86_64-linux
+          - os: ubuntu
+            ruby: jruby-head
+            platform: jruby
+          - os: ubuntu
+            ruby: "3.0"
+            platform: ruby
+
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - run: ruby --version
+
+      - name: Download gem from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: gem-${{ matrix.platform }}
+
+      - run: gem install --local *.gem --verbose
+
+      - name: Run tests
+        run: |
+          cd test/rcd_test/
+          bundle install
+          ruby -rrcd_test -S rake test
+
+  job_test_multiarch:
+    name: Test
+    needs: docker_build
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - from_image: amd64/centos
+            platform: x86_64-linux
+            dockerfile: centos
+          - from_image: navikey/raspbian-bullseye
+            platform: arm-linux
+            dockerfile: debian
+          - from_image: arm64v8/ubuntu
+            platform: aarch64-linux
+            dockerfile: debian
+          - from_image: i386/alpine
+            platform: x86-linux
+            dockerfile: alpine
+          - from_image: arm32v6/alpine
+            platform: arm-linux
+            dockerfile: alpine
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download gem from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: gem-${{ matrix.platform }}
+
+      - name: Build image and Run tests
+        run: |
+          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+          docker build --rm --build-arg from_image=${{matrix.from_image}} -t ruby-test -f test/env/Dockerfile.${{matrix.dockerfile}} .
+          docker run --rm -t --network=host -v `pwd`:/build ruby-test

data/.gitignore

@@ -1,9 +1,14 @@
 /.bundle/
 /.yardoc
+/Dockerfile.mri.aarch64-linux
+/Dockerfile.mri.arm-linux
+/Dockerfile.mri.arm64-darwin
+/Dockerfile.mri.arm64-linux
+/Dockerfile.mri.x64-mingw32
 /Dockerfile.mri.x86-linux
 /Dockerfile.mri.x86-mingw32
+/Dockerfile.mri.x86_64-darwin
 /Dockerfile.mri.x86_64-linux
-/Dockerfile.mri.x64-mingw32
 /Gemfile.lock
 /_yardoc/
 /coverage/
@@ -16,3 +21,8 @@
 *.o
 *.a
 mkmf.log
+.byebug_history
+test/rcd_test/Gemfile.lock
+test/rcd_test/pkg/
+test/rcd_test/tmp/
+test/rcd_test/vendor/

data/Dockerfile.jruby

@@ -1,7 +1,8 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
+ENV DEBIAN_FRONTEND noninteractive
 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-11-jdk-headless maven && \
     rm -rf /var/lib/apt/lists/*
 
 # Add "rvm" as system group, to avoid conflicts with host GIDs typically starting with 1000
@@ -13,7 +14,7 @@ RUN mkdir ~/.gnupg && \
     echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf
 
 # install rvm, RVM 1.26.0+ has signed releases, source rvm for usage outside of package scripts
-RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
+RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
     (curl -L http://get.rvm.io | sudo bash) && \
     bash -c " \
         source /etc/rubybashrc && \
@@ -26,7 +27,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.3.2.0 ; do \
         rvm install --binary \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
     done && \
     rvm cleanup all && \
@@ -46,8 +47,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.3.2.0"
+RUN echo "rvm use jruby-9.3.2.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,37 @@
-FROM ubuntu:<%= platform=~/linux/ ? "16.04" : "18.04" %>
-
+<%
+image = 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
+manylinux = !!(image =~ /manylinux/)
+%>
+FROM <%= image %>
+
+<% if manylinux %>
+# 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 libffi-devel git wget
+
+# 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 && \
@@ -14,20 +39,21 @@ RUN mkdir ~/.gnupg && \
     echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf
 
 # install rvm, RVM 1.26.0+ has signed releases, source rvm for usage outside of package scripts
-RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
+RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
     (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.9 3.1.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 +64,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.6' hoe 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,66 +74,133 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 
 # Add cross compilers for Windows and Linux
 USER root
+
+<% 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 \
+    /debs/
+RUN dpkg -i /debs/*.deb
+
+<% elsif !manylinux %>
 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=~/aarch64-linux/ %> gcc-aarch64-linux-gnu g++-aarch64-linux-gnu <% end %><%
+if platform=~/arm-linux/     %> gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf <% 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 3.1.0 && \
         rvm use default "
 
-<% if platform=~/linux/   %>
+<% if manylinux %>
 # Create dev tools x86-linux-*
 COPY build/mk_i686.rb /root/
 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 && \
+    ln -s /usr/bin/llvm-config-10 /usr/bin/llvm-config && \
+    ENABLE_COMPILER_RT_INSTALL=1 SDK_VERSION=11.1 ./build_compiler_rt.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
-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
+# Patch rake-compiler to build and install static libraries for Linux rubies
 USER rvm
-
-
-ENV XRUBIES 2.7.0 2.6.0 2.5.0 2.4.0 2.3.0 2.2.2
-
-# First do downloads sequentially since they can not run in parallel
-# Then build all xruby versions in parallel
+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.6 && \
+      echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.1.6/*.patch && \
+      ( git apply /home/rvm/patches/rake-compiler-1.1.6/*.patch || true ) \
+    done "
+
+# Patch rubies for cross build
+#USER root
+#RUN bash -c " \
+#    for v in 2.7.0 3.0.0 3.1.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
+
+<%
+axrubies = if platform =~ /x64-mingw-ucrt/
+  [
+    # Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
+    ["3.1.0", "3.1.0", true],
+  ]
+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", false],
+    ["3.0.0:2.7.0", "3.1.0", true],
+  ]
+else
+  [
+    # Build xruby versions prior ruby2_keywords in parallel using ruby-2.5
+    ["2.6.0:2.5.0:2.4.0", "2.5.9", false],
+    # Build xruby versions with ruby2_keywords in parallel using ruby-3.x
+    ["3.1.0:3.0.0:2.7.0", "3.1.0", true],
+  ]
+end
+
+axrubies.each do |xrubies, rvm, parallel| %>
+ENV XRUBIES <%= xrubies %>
+
+<% strip = '-s' if platform !~ /darwin/ %>
+# Build 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 " \
+    rvm use <%= rvm %> && \
+    export CPPFLAGS='<%= "-D__USE_MINGW_ANSI_STDIO=1" if platform=~/x64-mingw-ucrt/ %>' && \
+    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 <%= "-j`nproc`" if parallel %>' && \
+    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 "
+<% end %>
 
 <% if platform=~/linux/ %>
 # Avoid linking against libruby shared object.
@@ -115,7 +208,7 @@ RUN for rv in $XRUBIES; do \
 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/' $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/ %> -lcrypt <% end %>/' $f ; done
 <% end %>
 
 <% if platform=~/mingw/ %>
@@ -129,18 +222,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 +232,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/
@@ -159,22 +239,39 @@ RUN printf "1\n" | update-alternatives --config <%= target %>-gcc && \
     printf "1\n" | update-alternatives --config <%= target %>-g++
 <% 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
+<% if manylinux %>
+# 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
+
+# Use builtin functions of newer gcc to avoid linker issues on Musl based Linux
+COPY build/math_h.patch /root/
+RUN cd /usr/include/ && \
+    patch -p1 < /root/math_h.patch
+<% 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/
+COPY build/rcd-env.sh /etc/profile.d/
+RUN echo "source /etc/profile.d/rcd-env.sh" >> /etc/rubybashrc
 
 # 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.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
 
 CMD bash

data/History.md

@@ -1,3 +1,45 @@
+1.2.1 / 2022-03-17
+------------------
+
+* Fix testing for ruby C-API functions in mkmf. #65, #67
+* Use openjdk 11 to make maven work on ubuntu 20.04. #64
+* Remove x86_64-w64-mingw32-pkg-config from the x64-mingw-ucrt image. #63
+* Add a patch for math.h to use gcc builtins and to improve compat with musl based systems. #42
+
+
+1.2.0 / 2022-01-04
+------------------
+
+* Add Ruby-3.1 as native rvm and cross ruby versions.
+* Remove Ruby-2.2 and 2.3 from RUBY_CC_VERSION and cross rubies.
+* Add Linux cross build targets "arm-linux" and "aarch64-linux".
+* Add cross build target "x64-mingw-ucrt" for ruby-3.1 on Windows.
+* Add `wget` and `git` to Linux image.
+* Add `maven` to JRuby image.
+* Update JRuby to 9.3.2.0
+* Fix default value of platform for JRuby. #50
+* Update openjdk version from 14 to 17
+* Add a test gem and build and run it on all supported platforms on Github Actions.
+* Allow alternative build command like `docker buildx build`
+* Provide compiler-rt libraries for darwin builds. #60
+* Extract build environment from `runas` into `rcd-env.sh` and loaded it in non-interactive non-login shells. #57
+
+
+1.1.0 / 2020-12-29
+------------------
+
+* 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
 ------------------