rb_sys 0.9.19 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48b3782a3c2bd7804f9f0a1c42f4bbb1181173525c63011e77fa9a122b93bfe3
-  data.tar.gz: 04acd400f1997b1d1a981a148a7f9e7027d3b7af4c23fb924b97a5b3831f4115
+  metadata.gz: 63ba0fbfb3a21414b8e379d92abf8cf37ca5b310e57360d57d42d10a1aa42b22
+  data.tar.gz: 54ab9824e5902fbe11416cd8be8529fb90f9129412bbe916b5195270ca54fb9d
 SHA512:
-  metadata.gz: 706f56f3d6ee988b4216481d0bdbe90ba5a57e25304a07b7e790f9bc3c50adf91a76b2b12097747c4be4148b5e2a8bb1374f8c5d9dc9dd6e4318ab8bbee2ae25
-  data.tar.gz: 247aa3d5cf43aa9dd83775617ca2a2c60a68f15083a3502e05c9ad76aa8beaa0f2d725d846983e84f1b4af1b0503714d26fde921b14c3ea2e972f8fe19c2f1d3
+  metadata.gz: 523f540fdbfabed2e6988871ec2bd4f2d97a20c5ab0c39a8b10181dacff50a6c32cfcfaafe1335d6f4d5454458201feb20df7fb2fc14f6a28a8b9df7c077b1c8
+  data.tar.gz: a49dc910f814519fc42d37c08ba3ce52729b90ca47bc08a1f48f9edba26e54c7bcfe234ce952b80c0a2a8a88f82565bfc7784f9ee067e92b3bbade2cc7bda4dc

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,33 @@
+# 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, :clean_after_install
+
+      def initialize(builder)
+        @builder = builder
+        @force_install_rust_toolchain = false
+        @clean_after_install = rubygems_invoked?
+      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
+
+      private
+
+      # Seems to be the only way to reliably know if we were invoked by Rubygems.
+      # We want to know this so we can cleanup the target directory after an
+      # install, to remove bloat.
+      def rubygems_invoked?
+        ENV.key?("SOURCE_DATE_EPOCH")
+      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)
@@ -84,14 +88,14 @@ module RbSys
         target_prefix = #{target_prefix}
         TARGET_NAME = #{target[/\A\w+/]}
         TARGET_ENTRY = #{RbConfig::CONFIG["EXPORT_PREFIX"]}Init_$(TARGET_NAME)
-        CLEANLIBS = $(RUSTLIB) $(DLLIB) $(DEFFILE)
+        CLEANLIBS = $(RUSTLIB)
         RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
         TARGET = #{target}
         DLLIB = $(TARGET).#{RbConfig::CONFIG["DLEXT"]}
         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)
+        CLEANOBJS = $(TARGET_DIR)/.fingerprint $(TARGET_DIR)/incremental $(TARGET_DIR)/examples $(TARGET_DIR)/deps $(TARGET_DIR)/build $(TARGET_DIR)/.cargo-lock $(TARGET_DIR)/*.d $(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,16 +116,20 @@ 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}
         \t$(Q) $(COPY) "$(RUSTLIB)" $@
 
-        install: $(DLLIB) Makefile
+        install-so: $(DLLIB) Makefile
         \t$(ECHO) installing $(DLLIB)
         \t$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
         \t$(Q) $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 
+        install: #{builder.clean_after_install ? "install-so realclean" : "install-so"}
+
         all: #{$extout ? "install" : "$(DLLIB)"}
       MAKE
 
@@ -134,8 +143,7 @@ module RbSys
 
     def base_makefile(cargo_dir)
       base_makefile = dummy_makefile(__dir__).join("\n")
-      base_makefile.gsub!("all install static install-so install-rb", "all static install-so install-rb")
-      base_makefile.gsub!("clean-so::", "clean-so:\n\t-$(Q)$(RM) $(DLLIB)\n")
+      base_makefile.gsub!("all install static install-so install-rb", "all static install-rb")
       base_makefile.gsub!(/^srcdir = .*$/, "srcdir = #{cargo_dir}")
       base_makefile
     end
@@ -152,6 +160,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 +182,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.19"
+  VERSION = "0.9.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.22
 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-07-05 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