rb_sys 0.9.86 → 0.9.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de54443112fea979c0f80814ff0252ab792bda83197364e1cd3aa3f930a1a85a
-  data.tar.gz: 0c61277628ee98093a726f481d69d04256313664917725855de8b4cbb2e5b2e3
+  metadata.gz: ad789ca85cc714cf54fbe4a319c848abf886923c6452d3468cff39f1b053e2d3
+  data.tar.gz: 91c11f5b89aed8b9d7bd9227b4a389325b620ee6081db5aa4730de608f93551d
 SHA512:
-  metadata.gz: 818ace6b49c3129ff262a76aa60298fb04c0774b1ca1a15776f24c625003817ab46fe7824cdf0c0c512e1e2934e0ac75775ac6c1a5530053db5e1fa33ff6b6be
-  data.tar.gz: 978e2af0d3baa293bd9a90e9a8bd5014b4addaf85debddbf2b04abe7f3640128392f035767c38dea76a7705b26a73a3b54ea9fdb82086b934f78cc7d3d1878be
+  metadata.gz: 696b43646b4a8c82267ec837c394bf303ff0f7f1c0a2518dd6b099103aa825b6809a4e3fb27b6e595a832a1d47f7d6331e86c3cf95d7240be51909f23246e318
+  data.tar.gz: bc0bfadb3b46add5ea371c12da0b6da2ef75836688dd1a656da54c5823666297fd575da55f406c8c3c908f026ca10a5658202f38e72e8d127b5f43f8192e1278

data/exe/rb-sys-dock

@@ -359,7 +359,7 @@ def rcd(input_args)
   cmd = <<~SH
     #{default_docker_command} run \
       --platform #{OPTIONS.fetch(:docker_platform)} \
-      -v #{working_directory}:#{working_directory} \
+      -v $(pwd):$(pwd) \
       #{mount_tmp_dir} \
       #{mount_target_dir} \
       #{mount_cargo_registry} \

data/lib/rb_sys/cargo_builder.rb

@@ -9,7 +9,7 @@ module RbSys
     WELL_KNOWN_WRAPPERS = %w[sccache cachepot].freeze
 
     attr_accessor :spec, :runner, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir, :extra_rustflags,
-      :extra_cargo_args
+      :extra_cargo_args, :config
     attr_writer :profile
 
     def initialize(spec)
@@ -66,7 +66,11 @@ module RbSys
 
     def cargo_command(dest_path, args = [])
       cmd = []
-      cmd += ["cargo", "rustc"]
+      cmd += if config.use_cargo_build
+        ["cargo", "build"]
+      else
+        ["cargo", "rustc"]
+      end
       cmd += ["--target", target] if target
       cmd += ["--target-dir", dest_path]
       cmd += ["--features", features.join(",")] unless features.empty?
@@ -74,9 +78,11 @@ module RbSys
       cmd += ["--profile", profile.to_s]
       cmd += Gem::Command.build_args
       cmd += args
-      cmd += ["--"]
-      cmd += [*rustc_args(dest_path)]
-      cmd += extra_rustc_args
+      if !config.use_cargo_build
+        cmd += ["--"]
+        cmd += [*rustc_args(dest_path)]
+        cmd += extra_rustc_args
+      end
       cmd
     end
 
@@ -142,6 +148,10 @@ module RbSys
         flags += ["-C", "link-arg=#{dl_flag}"] unless makefile_config("DLDFLAGS")&.include?(dl_flag)
       end
 
+      if musl?
+        flags += ["-C", "target-feature=-crt-static"]
+      end
+
       flags
     end
 
@@ -328,7 +338,11 @@ module RbSys
     end
 
     def rubygems_invoked?
-      ENV.key?("SOURCE_DATE_EPOCH")
+      ENV.key?("SOURCE_DATE_EPOCH") && ENV["RB_SYS_TEST"] != "1"
+    end
+
+    def musl?
+      RbConfig::CONFIG["target_os"] == "linux-musl" || RbConfig::CONFIG["CC"]&.include?("musl-gcc")
     end
 
     # Error raised when no cdylib artifact was created

data/lib/rb_sys/mkmf/config.rb

@@ -25,8 +25,13 @@ module RbSys
       # Use compiled C code fallback for stable API for ruby-head (default: false)
       attr_accessor :use_stable_api_compiled_fallback
 
+      # Instead of the default `cargo rustc` behaviour, just call `cargo build`.
+      # Requires manually setting relevant rb-sys environment (default: false)
+      attr_accessor :use_cargo_build
+
       def initialize(builder)
         @builder = builder
+        @builder.config = self
         @force_install_rust_toolchain = false
         @auto_install_rust_toolchain = true
         @use_stable_api_compiled_fallback = false
@@ -55,7 +60,7 @@ module RbSys
       # install, to remove bloat.
       # @api private
       def rubygems_invoked?
-        ENV.key?("SOURCE_DATE_EPOCH")
+        ENV.key?("SOURCE_DATE_EPOCH") && ENV["RB_SYS_TEST"] != "1"
       end
 
       def use_stable_api_compiled_fallback?

data/lib/rb_sys/mkmf.rb

@@ -10,9 +10,6 @@ require_relative "mkmf/config"
 module RbSys
   # Helper class for creating Rust Makefiles
   module Mkmf
-    # @api private
-    GLOBAL_RUSTFLAGS = ["--cfg=rb_sys_gem"]
-
     # Helper for building Rust extensions by creating a Ruby compatible makefile
     # for Rust. By using this class, your rust extension will be 100% compatible
     # with the rake-compiler gem, which allows for easy cross compilation.
@@ -32,7 +29,7 @@ module RbSys
     #     r.env = { 'FOO' => 'bar' }
     #     r.profile = ENV.fetch('RB_SYS_CARGO_PROFILE', :dev).to_sym
     #     r.features = %w[some_cargo_feature]
-    #     r.rustflags = %w[--cfg=foo]
+    #     r.extra_rustflags = %w[--cfg=foo]
     #     r.target_dir = "some/target/dir"
     #   end
     def create_rust_makefile(target, &blk)
@@ -53,7 +50,9 @@ module RbSys
       RbConfig.expand(srcdir = srcprefix.dup)
 
       full_cargo_command = cargo_command(srcdir, builder)
-      global_rustflags = GLOBAL_RUSTFLAGS.dup
+
+      global_rustflags = []
+      global_rustflags << "--cfg=rb_sys_gem" unless builder.use_cargo_build
       global_rustflags << "--cfg=rb_sys_use_stable_api_compiled_fallback" if builder.use_stable_api_compiled_fallback?
 
       make_install = +<<~MAKE
@@ -169,7 +168,11 @@ module RbSys
       cargo_cmd = builder.cargo_command(dest_path, args)
       cmd = Shellwords.join(cargo_cmd)
       cmd.gsub!("\\=", "=")
-      cmd.gsub!(/\Acargo rustc/, "$(CARGO) rustc $(RB_SYS_EXTRA_CARGO_ARGS) --manifest-path $(RB_SYS_CARGO_MANIFEST_DIR)/Cargo.toml")
+      if builder.use_cargo_build
+        cmd.gsub!(/\Acargo rustc/, "$(CARGO) build $(RB_SYS_EXTRA_CARGO_ARGS) --manifest-path $(RB_SYS_CARGO_MANIFEST_DIR)/Cargo.toml")
+      else
+        cmd.gsub!(/\Acargo rustc/, "$(CARGO) rustc $(RB_SYS_EXTRA_CARGO_ARGS) --manifest-path $(RB_SYS_CARGO_MANIFEST_DIR)/Cargo.toml")
+      end
       cmd.gsub!(/-v=\d/, "")
       cmd
     end

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}, "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" => {"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}}
   end
 end

data/lib/rb_sys/toolchain_info.rb

@@ -28,6 +28,13 @@ module RbSys
         @supported ||= all.select(&:supported?)
       end
 
+      # Get all supported toolchain names, as strings.
+      #
+      # @return [Array<String>]
+      def supported_ruby_platforms
+        supported.map(&:platform)
+      end
+
       # Get the toolchain for the current platform.
       #
       # @return [RbSys::ToolchainInfo]

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.86
+  version: 0.9.94
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   DIZ6NVmpBvohJVCCCDxQQxFKLXZp1ivoxjN+m7eJSW7yzIz062pH4u8pPNQsiVSb
   I5rgRPbDr2rAFGXKoQ0+u6CLkRxqrVsITl/OPfZhBQI=
   -----END CERTIFICATE-----
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Helpers for compiling Rust extensions for ruby