rake-compiler-dock 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecf9523e93d97a66f6dd1fe7155fba58309e260e43cec95193d2a2547cb43bb4
-  data.tar.gz: 5c6298e90e0612236e72bae47cb03b57c50ee7fe2222428a712fa800d5e393e1
+  metadata.gz: d92bbeed535452c8abbcc2f132b42027ba12bcbcbab03d1708fc57c6d2bd4c24
+  data.tar.gz: a04b629209b03da4e64910621e71392d56410877d9a291978a6a075d26cadb73
 SHA512:
-  metadata.gz: 8e66bf4925c3596be41032a7ffa833db592406124ae89b4fcccdfc8d4d08d8ba9c9fc85286b252030ca859dfb1f6c93dc1cf2e5524d00b46ef98c4f2e5b22c78
-  data.tar.gz: 9dd9782cfe62ffdefe57cfe2ba5384d7573d03eed4fa938c61d04ab32d6ff20bbf3ff4d4b50f6282f98ddeac1f791fffecec288151190e639e1fb7f830dbff5c
+  metadata.gz: 9e17ec04f585b6f548ca1596d6b07f9435a18f0a66276543b1e15c4a2c8f905af306cb03024f3ecc8c2249a458d2c7c73eb8034abdf024f666b9750545570eb5
+  data.tar.gz: f0908f10dd36ee92f4c7586362c59059975508c205f3fcb88ec4d34620711d438a925a405bca6fa43d79ee5871597fc5bad921fe1246d53cab75fb9286726654

data/.github/workflows/ci.yml

@@ -143,9 +143,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu]
+        os: [ubuntu-latest]
         ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
@@ -261,39 +261,47 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos]
+        os: [macos-13, macos-14]
         ruby: ["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
+            ruby: "2.4"
+          - os: macos-14
+            ruby: "2.5"
         include:
-          - os: macos
+          - os: macos-13
             platform: x86_64-darwin
-          - os: ubuntu
+          - os: macos-14
+            platform: arm64-darwin
+          - os: ubuntu-latest
             ruby: jruby
             platform: jruby
-          - os: windows
+          - os: windows-latest
             ruby: "2.4"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.5"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.6"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.7"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "3.0"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "3.1"
             platform: x64-mingw-ucrt
-          - os: windows
+          - os: windows-latest
             ruby: "3.2"
             platform: x64-mingw-ucrt
-          - os: windows
+          - os: windows-latest
             ruby: "3.3"
             platform: x64-mingw-ucrt
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
@@ -321,31 +329,31 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: windows
+          - os: windows-latest
             ruby: "2.4"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.5"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.6"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.7"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "3.0"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "3.1"
             platform: x64-mingw-ucrt
-          - os: windows
+          - os: windows-latest
             ruby: "3.2"
             platform: x64-mingw-ucrt
-          - os: windows
+          - os: windows-latest
             ruby: "3.3"
             platform: x64-mingw-ucrt
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1

data/Dockerfile.mri.erb

@@ -1,8 +1,8 @@
 <%
 image = case platform
-  when /x86_64-linux-gnu/ then "quay.io/pypa/manylinux2014_x86_64"
-  when /x86-linux-gnu/ then "quay.io/pypa/manylinux2014_i686"
-  else "ubuntu:20.04"
+  when /x86_64-linux-gnu/ then "quay.io/pypa/manylinux2014_x86_64:latest@sha256:b4d7d9e15f3f5d143cd5aa0e2a2b6f2563bed17df1808c8f6662f9d57db72fa1"
+  when /x86-linux-gnu/ then "quay.io/pypa/manylinux2014_i686:latest@sha256:f2b004703f4712e0c88d89cd206447fe67d9efa881916dc7f4afefd7387eb0b2"
+  else "docker.io/library/ubuntu:20.04@sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d"
 end
 manylinux = !!(image =~ /manylinux/)
 %>
@@ -226,13 +226,17 @@ RUN mv /opt/osxcross/target/bin/<%= target %>-strip /opt/osxcross/target/bin/<%=
 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
+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 strip ; do ln -sf $DEVTOOLSET_ROOTPATH/usr/bin/$f $DEVTOOLSET_ROOTPATH/usr/bin/<%= target %>-$f ; done
 
 # Use builtin functions of newer gcc to avoid linker issues on Musl based Linux
 # TODO: remove in v1.6.0 once musl builds have been out for full minor release cycle, see 864be5b2
 COPY build/math_h.patch /root/
 RUN cd /usr/include/ && \
     patch -p1 < /root/math_h.patch
+
+# Update pkg-config because the distro ships 0.27.1 which is old and has bugs and performance issues.
+COPY build/mk_pkg_config.sh /root/
+RUN /root/mk_pkg_config.sh
 <% end %>
 
 <% if platform =~ /arm64-darwin/ %>

data/History.md

@@ -1,8 +1,17 @@
-# v1.5.0 / 2024-02-25
+# `rake-compiler/rake-compiler-dock` Changelog
 
-## Notable changes
+## 1.5.1 / 2024-06-03
 
-### First-class Linux `musl` libc support
+### Improvements
+
+The `x86_64-linux-gnu` and `x86-linux-gnu` containers (based on `manylinux_2014`) now have a modern version of `pkg-config`, v0.29.2, installed on them in `/usr/local/bin/pkg-config`. The distro's version (v0.27.1) is still in `/usr/bin/pkg-config` if you need to fall back for some reason, but the newer version will be used by default and should be backwards-compatible. (#121, #123 by @flavorjones)
+
+
+## 1.5.0 / 2024-02-25
+
+### Notable changes
+
+#### First-class Linux `musl` libc support
 
 * Add Linux musl cross build targets `aarch64-linux-musl`, `arm-linux-musl`, `x86-linux-musl`, and `x86_64-linux-musl`. #75, #111 (@flavorjones)
 * Add Linux cross build targets `aarch64-linux-gnu`, `arm-linux-gnu`, `x86-linux-gnu`, and `x86_64-linux-gnu`. #111 (@flavorjones)
@@ -11,13 +20,12 @@
 **Please read the README for details and caveats!**
 
 
-## Improvements
+### Improvements
 
-* Predefined user and group list is more complete, and represents the union of users and groups
-  across all RCD images.
+* Predefined user and group list is more complete, and represents the union of users and groups across all RCD images.
 
 
-## Changes to build containers
+### Changes to build containers
 
 * Replace `rvm` with `rbenv` and `ruby-build` in the build containers.
   - `rvm` has been replaced by `rbenv` and `ruby-build`

data/build/mk_pkg_config.sh

@@ -0,0 +1,24 @@
+#! /usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -x
+
+# sha256 from https://lists.freedesktop.org/archives/pkg-config/2017-March/001084.html
+TARFILE=pkg-config-0.29.2.tar.gz
+DIR=pkg-config-0.29.2
+CHECKSUM=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591
+
+cd /tmp
+
+wget https://pkgconfig.freedesktop.org/releases/${TARFILE}
+sha256sum ${TARFILE} | grep "${CHECKSUM}"
+
+tar -xzvf ${TARFILE}
+cd $DIR
+
+./configure --prefix=/usr/local
+make install
+
+pkg-config --version
+echo "OK"

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "1.5.0"
-  IMAGE_VERSION = "1.5.0"
+  VERSION = "1.5.1"
+  IMAGE_VERSION = "1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Lars Kanis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - build/mk_i686.rb
 - build/mk_musl_cross.sh
 - 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/rcd-env.sh
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows