rb_sys 0.9.105 → 0.9.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135a8c3d5c4f8791d7cd6ddbae8e4202cec8b5cc121ad0782ea733576911eb35
-  data.tar.gz: 9da56916b2c90882d77cf530363a4afa760ab04c7029ec02919920dc260699fb
+  metadata.gz: 8036fa98fd3454f15d3a043974360f56bfd055aa2b94698414e8a7e6dc85e51c
+  data.tar.gz: 8c4382d2ae0b8bbf204d6b086fb1995fd0ec8e1e34596b147321663b09cec368
 SHA512:
-  metadata.gz: 82eb2fe8d29a4fa56bcb8d3f359af4fec584cb8f7ff5db9147a353e550bbb2b32bb6293649ab393168f1ae121529cd87679740e1c339dfe06799c9798f532825
-  data.tar.gz: 86132f2df6c9e08dde2f081a2bd41e5d61f5c2731ffe6454a08840c21920c999a5028b60470b39301458f22973d676bd1bb10b20f2d889d0993088fe0525efdf
+  metadata.gz: c8dfaa75585b1adce9425bc5fa9455575ca99e233fc76345988fefb081c878fea411be031cce5459ba4756b492113e403385597e87add499bfc64bce75e43bcb
+  data.tar.gz: 7eda34ad782ef81834c1ad0f0c62125759f63d42562f33994a91bb401ba7e0a9f62ed7b64a894092d88da3e4812d5daa195547299a21a55dfe317a335caec03c

data/exe/rb-sys-dock

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
 require "optparse"
 require "open3"
+require "rake_compiler_dock"
 require "rb_sys/version"
 require "rb_sys/toolchain_info"
 require "rb_sys/cargo/metadata"
@@ -100,6 +101,10 @@ OptionParser.new do |opts|
 
   opts.on("-r", "--ruby-versions LIST", "List all supported Ruby versions") do |arg|
     vers = arg.split(/[^0-9.]+/).map do |v|
+      override = RakeCompilerDock.cross_rubies[v]
+
+      next override if override
+
       parts = v.split(".")
       parts[2] = "0" if parts[2].nil?
       parts.join(".")
@@ -359,9 +364,11 @@ def rcd(input_args)
   wrapper_command << "sigfw" unless interactive?(input_args)
   wrapper_command << "runas"
 
-  docker_options = []
+  docker_options = ["--pid=host"]
   docker_options << "--tty" if interactive?(input_args)
 
+  ruby_versions = ENV["RUBY_CC_VERSION"] || RakeCompilerDock.cross_rubies.values.join(":")
+
   cmd = <<~SH
     #{default_docker_command} run \
       --platform #{OPTIONS.fetch(:docker_platform)} \
@@ -383,7 +390,9 @@ def rcd(input_args)
       -e RCD_IMAGE \
       -e RB_SYS_DOCK_TMPDIR="/tmp/rb-sys-dock" \
       -e RB_SYS_CARGO_TARGET_DIR=#{tmp_target_dir.inspect} \
-      #{ENV["RUBY_CC_VERSION"] ? "-e RUBY_CC_VERSION=#{ENV["RUBY_CC_VERSION"]}" : ""} \
+      -e RUBY_CC_VERSION="#{ruby_versions}" \
+      -e RUBY_TARGET="#{OPTIONS.fetch(:platform)}" \
+      -e SOURCE_DATE_EPOCH="#{source_date_epoch}" \
       -e RAKEOPT \
       -e TERM \
       -w #{working_directory} \
@@ -402,6 +411,19 @@ def rcd(input_args)
   exec(cmd)
 end
 
+def source_date_epoch
+  return ENV["SOURCE_DATE_EPOCH"] if ENV.key?("SOURCE_DATE_EPOCH")
+
+  stdout, status = Open3.capture2("git log -1 --pretty=%ct")
+
+  if status.success?
+    stdout.strip
+  else
+    logger.warn("Could not determine SOURCE_DATE_EPOCH from git log, using current time")
+    Time.now.to_i.to_s
+  end
+end
+
 def download_image
   image = ENV.fetch("RCD_IMAGE")
 

data/lib/rb_sys/mkmf.rb

@@ -250,6 +250,9 @@ module RbSys
     end
 
     def optional_rust_toolchain(builder)
+      rustup_default_cmd = "$(Q) $(CARGO_HOME)/bin/rustup default $(RB_SYS_DEFAULT_TOOLCHAIN)"
+      rustup_toolchain_cmd = "$(Q) $(CARGO_HOME)/bin/rustup toolchain install $(RB_SYS_DEFAULT_TOOLCHAIN) --profile $(RB_SYS_RUSTUP_PROFILE)"
+
       <<~MAKE
         #{conditional_assign("RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN", force_install_rust_toolchain?(builder))}
 
@@ -260,8 +263,8 @@ module RbSys
         $(CARGO):
         \t$(Q) $(MAKEDIRS) $(CARGO_HOME) $(RUSTUP_HOME)
         \t$(Q) curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --no-modify-path --profile $(RB_SYS_RUSTUP_PROFILE) --default-toolchain none -y
-        \t$(Q) $(CARGO_HOME)/bin/rustup toolchain install $(RB_SYS_DEFAULT_TOOLCHAIN) --profile $(RB_SYS_RUSTUP_PROFILE)
-        \t$(Q) $(CARGO_HOME)/bin/rustup default $(RB_SYS_DEFAULT_TOOLCHAIN)
+        \t#{rustup_toolchain_cmd} || (sleep 5; #{rustup_toolchain_cmd}) || (sleep 5; #{rustup_toolchain_cmd})
+        \t#{rustup_default_cmd} || (sleep 5; #{rustup_default_cmd}) || (sleep 5; #{rustup_default_cmd})
         #{install_extra_rustup_targets(builder)}
 
         $(RUSTLIB): $(CARGO)

data/lib/rb_sys/toolchain_info/data.rb

@@ -5,6 +5,6 @@
 module RbSys
   class ToolchainInfo
     # @private
-    DATA = {"arm-linux" => {"rust-target" => "arm-unknown-linux-gnueabihf", "rake-compiler-dock" => {"cc" => "arm-linux-gnueabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "aarch64-linux" => {"rust-target" => "aarch64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "aarch64-linux-gnu-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "aarch64-linux-musl" => {"rust-target" => "aarch64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "aarch64-linux-musl-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "arm64-darwin" => {"rust-target" => "aarch64-apple-darwin", "rake-compiler-dock" => {"cc" => "aarch64-apple-darwin-clang"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "x64-mingw-ucrt" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x64-mingw32" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86-linux" => {"rust-target" => "i686-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "i686-redhat-linux-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86-mingw32" => {"rust-target" => "i686-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "i686-w64-mingw32-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86_64-darwin" => {"rust-target" => "x86_64-apple-darwin", "rake-compiler-dock" => {"cc" => "x86_64-apple-darwin-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux" => {"rust-target" => "x86_64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "x86_64-redhat-linux-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux-musl" => {"rust-target" => "x86_64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "x86_64-unknown-linux-musl-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}}
+    DATA = {"arm-linux" => {"rust-target" => "arm-unknown-linux-gnueabihf", "rake-compiler-dock" => {"cc" => "arm-linux-gnueabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "aarch64-linux" => {"aliases" => ["aarch64-linux-gnu", "aarch64-unknown-linux-gnu"], "rust-target" => "aarch64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "aarch64-linux-gnu-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "aarch64-linux-musl" => {"rust-target" => "aarch64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "aarch64-linux-musl-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "arm64-darwin" => {"rust-target" => "aarch64-apple-darwin", "rake-compiler-dock" => {"cc" => "aarch64-apple-darwin-clang"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "x64-mingw-ucrt" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x64-mingw32" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86-linux" => {"rust-target" => "i686-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "i686-redhat-linux-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86-mingw32" => {"rust-target" => "i686-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "i686-w64-mingw32-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86_64-darwin" => {"rust-target" => "x86_64-apple-darwin", "rake-compiler-dock" => {"cc" => "x86_64-apple-darwin-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux" => {"aliases" => ["x86_64-linux-gnu", "x86_64-unknown-linux-gnu"], "rust-target" => "x86_64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "x86_64-redhat-linux-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux-musl" => {"rust-target" => "x86_64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "x86_64-unknown-linux-musl-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}}
   end
 end

data/lib/rb_sys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbSys
-  VERSION = "0.9.105"
+  VERSION = "0.9.111"
 end

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.105
+  version: 0.9.111
 platform: ruby
 authors:
 - Ian Ker-Seymer
-autorequire:
 bindir: exe
 cert_chain:
 - |
@@ -29,9 +28,22 @@ cert_chain:
   Lvd35BNvZkhFzs9xfykhurpkT2TiP2F3ZFn9dwLXMFe41pwrtEYLIWhYi8mUG4Ek
   6aR8M/tqIpChVV39
   -----END CERTIFICATE-----
-date: 2024-12-28 00:00:00.000000000 Z
-dependencies: []
-description:
+date: 2025-02-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.1
 email:
 - i.kerseymer@gmail.com
 executables:
@@ -66,7 +78,6 @@ metadata:
   homepage_uri: https://oxidize-rb.github.io/rb-sys/
   source_code_uri: https://github.com/oxidize-rb/rb-sys
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -81,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Helpers for compiling Rust extensions for ruby
 test_files: []