rb_sys 0.9.89 → 0.9.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b63d2f66b32950cf95f91a0ae43183917d140d45468d01c23fbdf90e60c96c89
-  data.tar.gz: c2fad00ab79f9828c4396d8b20240486823efc448905e3bd27933583021a197c
+  metadata.gz: c5f116217a0a284e2e0bcb56b6b582604f1152b065f3425eb294785d8cfc4c2e
+  data.tar.gz: e7f23fad1b06f140b11cd6f5e6d5f931ce420c2ecf03f95bdcf634d3f88ce446
 SHA512:
-  metadata.gz: 7dc2d83125329bd25952494f1b552ee083cef1f5dacab99ca79df61baae0d7386505a5ad624824d07201f17c5406c735503e848c7f2eb5aa8b4a7c4710c52b58
-  data.tar.gz: c6048e23429dada10c8ce6b40a55bf2d6a6795c60ba8bbf4a4728e402ecc8ca666e6c52588636e68f1d730fc16d1b3db165db45af90b47198bc1bb4708ba4ad1
+  metadata.gz: '09caae7450fd9ba3ffd00d3eb5250061fc75cdf0d0bbdd15028fc19a874308602ed86759defe64304200f7e7eed93ee997e0a2bc5dc70c1879967c196fb8bc6e'
+  data.tar.gz: f3ebb2d447253c49531df6f42a6264cc57d32dd195d4eff088166be8da9264c528b37e4b19e6bb4c378a7e626ba1af4726128eb5d1cc2b5a3e05e663aadb9897

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
 

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

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.89"
+  VERSION = "0.9.91"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.89
+  version: 0.9.91
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   DIZ6NVmpBvohJVCCCDxQQxFKLXZp1ivoxjN+m7eJSW7yzIz062pH4u8pPNQsiVSb
   I5rgRPbDr2rAFGXKoQ0+u6CLkRxqrVsITl/OPfZhBQI=
   -----END CERTIFICATE-----
-date: 2024-02-24 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies: []
 description:
 email:

metadata.gz.sig

@@ -1 +1 @@
-��G��43��1�
z^��Jl�D7;~�&������GU���X��'M����Rxf�1&@�NX"�p��I�Yw�9PH<ea��I:y%�f��ƈ-y���b���Y�|ޗ��+���0d�p�ÿ{���jԫ��1~��}iZN����!��M۠�wt�>1��L���`vs4���>��A%�h�>U�'������ي&�*S9���N�xK�_fo�Qb��9c=Z��Zq!��0����:�.��
+l�kp��`����Ҽ?������w�U���O�l��7���J�"͙[={�Jϴ|T�oѳ��4v"�e^�A�2��c	�]O:_�{r��>�%�Պ��r|~w�z�e��GX�(N�A�<�oP>'~Zf;�Y�m-	�k�Ei���H��l|kU
����N���&�(K&M���:��|~