rb_sys 0.1.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7755763e3f051172f51006a6687ebf6903b7398279616a870ef767fd40e1bb2a
-  data.tar.gz: 738c78050d540fbcdba4f3574ce768ed0cb3a6edc19f1a1864808c3326f829af
+  metadata.gz: 27affe876fb5901792fe8af81776d7b6b6094b7b97849c1a8894296c6d119f77
+  data.tar.gz: a1e59e9580925d7d0a470ec33c72f4fe296148efacb546901d40b4fb99c543bf
 SHA512:
-  metadata.gz: a2cbd1b6111a37dca8391436b38163c563c0e35f38c0a73f28314f0eb4fd5eabda17ce392b71c20e8e7bb1fc5619fcb8d6dd95443acb35a86ea2830869e90aa7
-  data.tar.gz: d494ee43053464007c2ecbe7dffdf0acd0b908a8e4d3b5f4b607371472dd70e07c328fd56d692911446030b8e4c8e6fc8d7fd5ce891bb867afc582b969f89ae1
+  metadata.gz: acfa547f5b88a8274c384a6d72953b22eaf5c8b551092caac377a533d80160a1f9fb76dbdf09668957dbe016ed78b6c1e5bfd57bb0ccfaf1cbab85b675353046
+  data.tar.gz: c56ed902664615dd777a9611fcbe3b7ae2229a8832690c47b568340df9746278939fd82d3b05dea1c7b258116ce2deb59a1c30ac954b648ddb552b922e70eef8

data/lib/rb_sys/mkmf.rb

@@ -6,9 +6,29 @@ require_relative "./../../vendor/rubygems/ext/cargo_builder"
 
 # Root module
 module RbSys
-  # Helpers for creating a Ruby compatible makefile for Rust
+  # Helper class for creating Rust Makefiles
   module Mkmf
-    def create_rust_makefile(target, srcprefix = nil)
+    # 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.
+    #
+    # @example Basic
+    #   require 'mkmf'
+    # . require 'rb_sys/mkmf'
+    #
+    # . create_rust_makefile("my_extension") #=> Generate a Makefile in the current directory
+    #
+    # @example Configure a custom build profile
+    #   require 'mkmf'
+    # . require 'rb_sys/mkmf'
+    #
+    # . create_rust_makefile("my_extension") do |r|
+    # .   # All of these are optional
+    # .   r.env = { 'FOO' => 'bar' }
+    # .   r.profile = ENV.fetch('CARGO_BUILD_PROFILE', :dev).to_sym
+    # .   r.features = %w[some_cargo_feature]
+    # . end
+    def create_rust_makefile(target, srcprefix = nil, &blk)
       if target.include?("/")
         target_prefix, target = File.split(target)
         target_prefix[0, 0] = "/"
@@ -18,6 +38,9 @@ module RbSys
 
       spec = Struct.new(:name, :metadata).new(target, {})
       builder = Gem::Ext::CargoBuilder.new(spec)
+
+      yield builder if blk
+
       srcprefix ||= "$(srcdir)/#{srcprefix}".chomp("/")
       RbConfig.expand(srcdir = srcprefix.dup)
 
@@ -70,7 +93,19 @@ module RbSys
     end
 
     def env_vars(builder)
-      builder.build_env.map { |k, v| %($(DLLIB): export #{k} = #{v.gsub("\n", '\n')}) }.join("\n")
+      lines = builder.build_env.map { |k, v| env_line(k, v) }
+      lines << env_line("CC", env_or_makefile_config("CC"))
+      lines << env_line("AR", env_or_makefile_config("AR")) unless env_or_makefile_config("AR") == "libtool -static"
+      lines.compact.join("\n")
+    end
+
+    def env_line(k, v)
+      return unless v
+      %($(DLLIB): export #{k} = #{v.gsub("\n", '\n')})
+    end
+
+    def env_or_makefile_config(key)
+      ENV[key] || RbConfig::MAKEFILE_CONFIG[key]
     end
 
     def dllib_path(builder)

data/lib/rb_sys/version.rb

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

data/vendor/rubygems/ext/cargo_builder.rb

@@ -4,7 +4,7 @@
 # over the `cargo rustc` command which takes care of building Rust code in a way
 # that Ruby can use.
 class Gem::Ext::CargoBuilder < Gem::Ext::Builder
-  attr_accessor :spec, :runner, :profile
+  attr_accessor :spec, :runner, :profile, :env, :features, :target, :extra_rustc_args
 
   def initialize(spec)
     require "rubygems/command"
@@ -12,7 +12,11 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
 
     @spec = spec
     @runner = self.class.method(:run)
-    @profile = :release
+    @profile = ENV.fetch("CARGO_BUILD_PROFILE", :release).to_sym
+    @env = {}
+    @features = []
+    @target = ENV['CARGO_BUILD_TARGET']
+    @extra_rustc_args = []
   end
 
   def build(_extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd)
@@ -37,7 +41,7 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
   def build_env
     build_env = rb_config_env
     build_env["RUBY_STATIC"] = "true" if ruby_static? && ENV.key?("RUBY_STATIC")
-    build_env
+    build_env.merge(env)
   end
 
   def cargo_command(cargo_dir, dest_path, args = [])
@@ -46,23 +50,25 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
 
     cmd = []
     cmd += [cargo, "rustc"]
-    cmd += ["--target", ENV["CARGO_BUILD_TARGET"]] if ENV["CARGO_BUILD_TARGET"]
+    cmd += ["--target", target] if target
     cmd += ["--target-dir", dest_path]
+    cmd += ["--features", features.join(",")] unless features.empty?
     cmd += ["--manifest-path", manifest]
     cmd += ["--lib"]
     cmd += ["--profile", profile.to_s]
-    cmd += ["--locked"] if profile == :release
+    cmd += ["--locked"] if profile.to_s == 'release'
     cmd += Gem::Command.build_args
     cmd += args
     cmd += ["--"]
     cmd += [*cargo_rustc_args(dest_path)]
+    cmd += extra_rustc_args
     cmd
   end
 
   def cargo_dylib_path(dest_path)
     prefix = so_ext == "dll" ? "" : "lib"
     path_parts = [dest_path]
-    path_parts << ENV["CARGO_BUILD_TARGET"] if ENV["CARGO_BUILD_TARGET"]
+    path_parts << target if target 
     path_parts += [profile_target_directory, "#{prefix}#{cargo_crate_name}.#{so_ext}"]
     File.join(*path_parts)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   Rl+ASkq2/1i07TkBpCf+2hq66+h/hx+/Y/KrUzXfe0jtvil0WESkJT2kqRqHWNhD
   9GKBxaQlXokNDtWCm1/gl6cD8WRZ0N5S4ZGJT1FLLsA=
   -----END CERTIFICATE-----
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies: []
 description:
 email: