rb_sys 0.9.18 → 0.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a77ec921cf8f55b614bc5f9cdca97ab6c70ab665844872f75854acc9b9b661
-  data.tar.gz: bdc868687c0b8b6981ab736b39e392656d5b77f8ad0331b076d5a99abacdcb56
+  metadata.gz: 1ef1de2cec5dcbbaaa9d8cc147b9bf727ce66c3beeb03ac6966549677a58a666
+  data.tar.gz: 5a693be7f33111e218293d7f6ff1e1ed8b4b3f1e238384a7c5f2d29ee654e713
 SHA512:
-  metadata.gz: d1a4dd01534046638cf54bf50eff4a8725d5987265f3fe71fb08ec9406bd30938b48de5a4e7efde70cc44ebec0d1be8afe004fe6ed3f85631b0abab46986f48a
-  data.tar.gz: f9b949fc7a3476917607a3ac7b9aca1d69c7be54b149cc877002ea49e2e4417939b1c0ae7b85685274e19d1b5a2745027b373d65c1997462176650f0c0af1866
+  metadata.gz: c3b0b95982617b6df58a1e78359858fce84510559386f537de606781bbb4d1e9431c349830ac1655140b373ec57f29b48b26705d715056d1a50b30233b362775
+  data.tar.gz: 2fc14bb752c42481d37de6b6f5e12fbcd43f55b580ddd9dc7ef158ee836fce241a990fc1b96dfa8b5babb055df5cdf828824f1983bf76a0cebddaec99442565c

data/lib/rb_sys/cargo_builder.rb

@@ -1,6 +1,6 @@
 module RbSys
   class CargoBuilder < Gem::Ext::Builder
-    attr_accessor :spec, :runner, :profile, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir
+    attr_accessor :spec, :runner, :profile, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir, :extra_rustflags
 
     def initialize(spec)
       require "rubygems/command"
@@ -15,6 +15,7 @@ module RbSys
       @extra_rustc_args = []
       @dry_run = true
       @ext_dir = nil
+      @extra_rustflags = []
     end
 
     def build(_extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd)

data/lib/rb_sys/mkmf/config.rb

@@ -0,0 +1,23 @@
+# Root module
+module RbSys
+  # Helper class for creating Rust Makefiles
+  module Mkmf
+    # Config that delegates to CargoBuilder if needded
+    class Config
+      attr_accessor :force_install_rust_toolchain
+
+      def initialize(builder)
+        @builder = builder
+        @force_install_rust_toolchain = false
+      end
+
+      def method_missing(name, *args, &blk)
+        @builder.send(name, *args, &blk)
+      end
+
+      def respond_to_missing?(name, include_private = false)
+        @builder.respond_to?(name) || super
+      end
+    end
+  end
+end

data/lib/rb_sys/mkmf.rb

@@ -3,6 +3,7 @@
 require "rubygems/ext"
 require "shellwords"
 require_relative "cargo_builder"
+require_relative "mkmf/config"
 
 # Root module
 module RbSys
@@ -37,7 +38,8 @@ module RbSys
       end
 
       spec = Struct.new(:name, :metadata).new(target, {})
-      builder = CargoBuilder.new(spec)
+      cargo_builder = CargoBuilder.new(spec)
+      builder = Config.new(cargo_builder)
 
       yield builder if blk
 
@@ -48,6 +50,7 @@ module RbSys
 
       # rubocop:disable Style/GlobalVars
       make_install = +<<~MAKE
+        RB_SYS_BUILD_DIR ?= #{File.join(Dir.pwd, ".rb-sys")}
         CARGO ?= cargo
         CARGO_BUILD_TARGET ?= #{builder.target}
         SOEXT ?= #{builder.so_ext}
@@ -59,6 +62,7 @@ module RbSys
 
         RB_SYS_CARGO_PROFILE ?= #{builder.profile}
         RB_SYS_CARGO_FEATURES ?= #{builder.features.join(",")}
+        RB_SYS_EXTRA_RUSTFLAGS ?= #{builder.extra_rustflags.join(" ")}
 
         # Set dirname for the profile, since the profiles do not directly map to target dir (i.e. dev -> debug)
         ifeq ($(RB_SYS_CARGO_PROFILE),dev)
@@ -91,7 +95,7 @@ module RbSys
         TARGET_DIR = #{Dir.pwd}/$(RB_SYS_CARGO_BUILD_TARGET_DIR)/$(RB_SYS_CARGO_PROFILE_DIR)
         RUSTLIB = $(TARGET_DIR)/$(SOEXT_PREFIX)$(TARGET_NAME).$(SOEXT)
 
-        DISTCLEANDIRS = $(TARGET_DIR)
+        DISTCLEANDIRS = $(TARGET_DIR) $(RB_SYS_BUILD_DIR)
         DEFFILE = $(TARGET_DIR)/$(TARGET)-$(arch).def
         #{base_makefile(srcdir)}
 
@@ -100,6 +104,7 @@ module RbSys
         endif
 
         #{env_vars(builder)}
+        $(DLLIB): export RUSTFLAGS := $(RUSTFLAGS) $(RB_SYS_EXTRA_RUSTFLAGS)
 
         FORCE: ;
 
@@ -111,6 +116,8 @@ module RbSys
         \t$(ECHO) generating $(@)
         \t$(Q) ($(COPY) $(srcdir)/$(TARGET).def $@ 2> /dev/null) || (echo EXPORTS && echo $(TARGET_ENTRY)) > $@
 
+        #{optional_rust_toolchain(builder)}
+
         $(DLLIB): $(DEFFILE) FORCE
         \t$(ECHO) generating $(@) \\("$(RB_SYS_CARGO_PROFILE)"\\)
         \t$(Q) #{full_cargo_command}
@@ -152,6 +159,7 @@ module RbSys
     def env_vars(builder)
       lines = builder.build_env.map { |k, v| env_line(k, v) }
       lines << env_line("CC", env_or_makefile_config("CC"))
+      lines << env_line("CXX", env_or_makefile_config("CXX"))
       lines << env_line("AR", env_or_makefile_config("AR")) unless env_or_makefile_config("AR") == "libtool -static"
       lines.compact.join("\n")
     end
@@ -173,6 +181,45 @@ module RbSys
       cargo_command.gsub!(%r{/#{target_dir}/[^/]+}, "/$(RB_SYS_CARGO_BUILD_TARGET_DIR)/$(RB_SYS_CARGO_PROFILE_DIR)")
       cargo_command
     end
+
+    def optional_rust_toolchain(builder)
+      <<~MAKE
+        RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN ?= #{builder.force_install_rust_toolchain}
+
+        # Only run if the we are told to explicitly install the Rust toolchain
+        ifneq ($(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN),false)
+        RB_SYS_RUSTUP_PROFILE ?= minimal
+
+        # If the user passed true, we assume stable Rust. Otherwise, use what
+        # was specified (i.e. RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN=beta)
+        ifeq ($(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN),true)
+          RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN = stable
+        endif
+
+        # If a $RUST_TARGET is specified (i.e. for rake-compiler-dock), append
+        # that to the profile.
+        ifeq ($(RUST_TARGET),)
+          RB_SYS_DEFAULT_TOOLCHAIN = $(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN)
+        else
+          RB_SYS_DEFAULT_TOOLCHAIN = $(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN)-$(RUST_TARGET)
+        endif
+
+        export CARGO_HOME ?= $(RB_SYS_BUILD_DIR)/$(RB_SYS_DEFAULT_TOOLCHAIN)/cargo
+        export RUSTUP_HOME ?= $(RB_SYS_BUILD_DIR)/$(RB_SYS_DEFAULT_TOOLCHAIN)/rustup
+        export PATH := $(CARGO_HOME)/bin:$(RUSTUP_HOME)/bin:$(PATH)
+        export RUSTUP_TOOLCHAIN := $(RB_SYS_DEFAULT_TOOLCHAIN)
+        export CARGO := $(CARGO_HOME)/bin/cargo
+
+        $(CARGO): 
+        \t$(Q) $(MAKEDIRS) $(CARGO_HOME) $(RUSTUP_HOME)
+        \tcurl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
+        \trustup toolchain install $(RB_SYS_DEFAULT_TOOLCHAIN) --profile $(RB_SYS_RUSTUP_PROFILE)
+        \trustup default $(RB_SYS_DEFAULT_TOOLCHAIN)
+
+        $(DLLIB): $(CARGO)
+        endif
+      MAKE
+    end
   end
 end
 

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.21
 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-06-30 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -46,6 +46,7 @@ files:
 - lib/rb_sys/cargo_builder.rb
 - lib/rb_sys/cargo_builder/link_flag_converter.rb
 - lib/rb_sys/mkmf.rb
+- lib/rb_sys/mkmf/config.rb
 - lib/rb_sys/version.rb
 - sig/rb_sys.rbs
 homepage: https://github.com/oxidize-rb/rb-sys
@@ -62,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="