rb_sys 0.9.22 → 0.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63ba0fbfb3a21414b8e379d92abf8cf37ca5b310e57360d57d42d10a1aa42b22
-  data.tar.gz: 54ab9824e5902fbe11416cd8be8529fb90f9129412bbe916b5195270ca54fb9d
+  metadata.gz: 690a0a0013da370bdbe206fa6067d7f40ef4368fd7031aa24fc27d45c2f5ddbf
+  data.tar.gz: d0bea23bc70fa5109ef69cc12504e2d5ba00ca408033702803aef5c0d6a89737
 SHA512:
-  metadata.gz: 523f540fdbfabed2e6988871ec2bd4f2d97a20c5ab0c39a8b10181dacff50a6c32cfcfaafe1335d6f4d5454458201feb20df7fb2fc14f6a28a8b9df7c077b1c8
-  data.tar.gz: a49dc910f814519fc42d37c08ba3ce52729b90ca47bc08a1f48f9edba26e54c7bcfe234ce952b80c0a2a8a88f82565bfc7784f9ee067e92b3bbade2cc7bda4dc
+  metadata.gz: 5554e164a6bb504282013e31f56a34f44381f81785dd1f4660b8d126555fd049ca2f6c71b51c91b959740e3b721bf674fe75756eb6fbd8d4754c36df54108d69
+  data.tar.gz: ab49ec7247e0dd08203bf4dc4db749969d440deafd30c0bb00784f0883b5d02cf87d6f01de0163f2c94792653263827c5236fd02d3b9958f9ca7434c88bf1f6c

data/lib/rb_sys/mkmf.rb

@@ -88,15 +88,16 @@ module RbSys
         target_prefix = #{target_prefix}
         TARGET_NAME = #{target[/\A\w+/]}
         TARGET_ENTRY = #{RbConfig::CONFIG["EXPORT_PREFIX"]}Init_$(TARGET_NAME)
-        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)
 
-        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)
+        CLEANOBJS = $(TARGET_DIR)/.fingerprint $(TARGET_DIR)/incremental $(TARGET_DIR)/examples $(TARGET_DIR)/deps $(TARGET_DIR)/build $(TARGET_DIR)/.cargo-lock $(TARGET_DIR)/*.d $(TARGET_DIR)/*.rlib $(RB_SYS_BUILD_DIR)
         DEFFILE = $(TARGET_DIR)/$(TARGET)-$(arch).def
+        CLEANLIBS = $(DLLIB) $(RUSTLIB) $(DEFFILE)
+
         #{base_makefile(srcdir)}
 
         ifneq ($(RB_SYS_VERBOSE),)
@@ -104,7 +105,7 @@ module RbSys
         endif
 
         #{env_vars(builder)}
-        $(DLLIB): export RUSTFLAGS := $(RUSTFLAGS) $(RB_SYS_EXTRA_RUSTFLAGS)
+        $(RUSTLIB): export RUSTFLAGS := $(RUSTFLAGS) $(RB_SYS_EXTRA_RUSTFLAGS)
 
         FORCE: ;
 
@@ -118,15 +119,17 @@ module RbSys
 
         #{optional_rust_toolchain(builder)}
 
-        $(DLLIB): $(DEFFILE) FORCE
+        $(RUSTLIB): $(DEFFILE) FORCE
         \t$(ECHO) generating $(@) \\("$(RB_SYS_CARGO_PROFILE)"\\)
         \t$(Q) #{full_cargo_command}
+
+        $(DLLIB): $(RUSTLIB)
         \t$(Q) $(COPY) "$(RUSTLIB)" $@
 
-        install-so: $(DLLIB) Makefile
-        \t$(ECHO) installing $(DLLIB)
+        install-so: $(DLLIB)
+        \t$(ECHO) installing $(DLLIB) to $(RUBYARCHDIR)
         \t$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
-        \t$(Q) $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+        \t$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 
         install: #{builder.clean_after_install ? "install-so realclean" : "install-so"}
 
@@ -167,7 +170,7 @@ module RbSys
 
     def env_line(k, v)
       return unless v
-      %($(DLLIB): export #{k} = #{v.gsub("\n", '\n')})
+      %($(RUSTLIB): export #{k} = #{v.gsub("\n", '\n')})
     end
 
     def env_or_makefile_config(key)
@@ -213,11 +216,11 @@ module RbSys
 
         $(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
+        \tcurl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --no-modify-path --profile minimal --default-toolchain none -y
         \trustup toolchain install $(RB_SYS_DEFAULT_TOOLCHAIN) --profile $(RB_SYS_RUSTUP_PROFILE)
         \trustup default $(RB_SYS_DEFAULT_TOOLCHAIN)
 
-        $(DLLIB): $(CARGO)
+        $(RUSTLIB): $(CARGO)
         endif
       MAKE
     end

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.23
 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-19 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email: