rb_sys 0.9.16 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c40e7db0cd8e93b7b3b4b0419ae4055b3ada46565d85d7dfa14f07289a9acc9
-  data.tar.gz: ca32433b3b2e38247500350a12430c9e43cdb496f2848ffcc610d43741a4640a
+  metadata.gz: 48b3782a3c2bd7804f9f0a1c42f4bbb1181173525c63011e77fa9a122b93bfe3
+  data.tar.gz: 04acd400f1997b1d1a981a148a7f9e7027d3b7af4c23fb924b97a5b3831f4115
 SHA512:
-  metadata.gz: b0a2eabcd78e7190c0ecaad5e2517e80979d24f69d4e14c933480a7b8d2fb39de4b99ffe7204da026a4edc272f87a2d5e4cf889101af13be447e72cdf9b6e09e
-  data.tar.gz: ec76e3a0d5b5559da6c8f9685ef7d80b5e503b8504385234d72bd930edcdcf42f56ebd27e6d52a24f8c245b0adce12e4eff9dd5e8d4af8f9e9f03d9fea428af9
+  metadata.gz: 706f56f3d6ee988b4216481d0bdbe90ba5a57e25304a07b7e790f9bc3c50adf91a76b2b12097747c4be4148b5e2a8bb1374f8c5d9dc9dd6e4318ab8bbee2ae25
+  data.tar.gz: 247aa3d5cf43aa9dd83775617ca2a2c60a68f15083a3502e05c9ad76aa8beaa0f2d725d846983e84f1b4af1b0503714d26fde921b14c3ea2e972f8fe19c2f1d3

data/lib/rb_sys/cargo_builder.rb

@@ -11,7 +11,7 @@ module RbSys
       @profile = ENV.fetch("RB_SYS_CARGO_BUILD_PROFILE", :release).to_sym
       @env = {}
       @features = []
-      @target = ENV["CARGO_BUILD_TARGET"]
+      @target = ENV["CARGO_BUILD_TARGET"] || ENV["RUST_TARGET"]
       @extra_rustc_args = []
       @dry_run = true
       @ext_dir = nil
@@ -70,6 +70,22 @@ module RbSys
       File.join(*path_parts)
     end
 
+    # We have to basically reimplement RbConfig::CONFIG['SOEXT'] here to support
+    # Ruby < 2.5
+    #
+    # @see https://github.com/ruby/ruby/blob/c87c027f18c005460746a74c07cd80ee355b16e4/configure.ac#L3185
+    def so_ext
+      return RbConfig::CONFIG["SOEXT"] if RbConfig::CONFIG.key?("SOEXT")
+
+      if win_target?
+        "dll"
+      elsif darwin_target?
+        "dylib"
+      else
+        "so"
+      end
+    end
+
     private
 
     def rb_config_env
@@ -227,22 +243,6 @@ module RbSys
       deffile_path
     end
 
-    # We have to basically reimplement RbConfig::CONFIG['SOEXT'] here to support
-    # Ruby < 2.5
-    #
-    # @see https://github.com/ruby/ruby/blob/c87c027f18c005460746a74c07cd80ee355b16e4/configure.ac#L3185
-    def so_ext
-      return RbConfig::CONFIG["SOEXT"] if RbConfig::CONFIG.key?("SOEXT")
-
-      if win_target?
-        "dll"
-      elsif darwin_target?
-        "dylib"
-      else
-        "so"
-      end
-    end
-
     # Corresponds to $(LIBPATH) in mkmf
     def mkmf_libpath
       ["-L", "native=#{makefile_config("libdir")}"]

data/lib/rb_sys/mkmf.rb

@@ -48,34 +48,57 @@ module RbSys
 
       # rubocop:disable Style/GlobalVars
       make_install = +<<~MAKE
+        CARGO ?= cargo
+        CARGO_BUILD_TARGET ?= #{builder.target}
+        SOEXT ?= #{builder.so_ext}
+
+        # Determine the prefix Cargo uses for the lib.
+        ifneq ($(SOEXT),dll)
+          SOEXT_PREFIX ?= lib
+        endif
+
         RB_SYS_CARGO_PROFILE ?= #{builder.profile}
         RB_SYS_CARGO_FEATURES ?= #{builder.features.join(",")}
-        CARGO ?= cargo
 
+        # 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)
-          RB_SYS_TARGET_DIR ?= debug
+          RB_SYS_CARGO_PROFILE_DIR ?= debug
         else
-          RB_SYS_TARGET_DIR ?= $(RB_SYS_CARGO_PROFILE)
+          RB_SYS_CARGO_PROFILE_DIR ?= $(RB_SYS_CARGO_PROFILE)
         endif
 
+        # Set the build profile (dev, release, etc.) Compat with Rust 1.51.
         ifeq ($(RB_SYS_CARGO_PROFILE),release)
           RB_SYS_CARGO_PROFILE_FLAG = --release
         else
           RB_SYS_CARGO_PROFILE_FLAG = --profile $(RB_SYS_CARGO_PROFILE)
         endif
 
+        # Account for sub-directories when using `--target` argument with Cargo
+        ifneq ($(CARGO_BUILD_TARGET),)
+          RB_SYS_CARGO_BUILD_TARGET_DIR ?= target/$(CARGO_BUILD_TARGET)
+        else
+          RB_SYS_CARGO_BUILD_TARGET_DIR ?= target
+        endif
+
         target_prefix = #{target_prefix}
         TARGET_NAME = #{target[/\A\w+/]}
         TARGET_ENTRY = #{RbConfig::CONFIG["EXPORT_PREFIX"]}Init_$(TARGET_NAME)
         CLEANLIBS = $(RUSTLIB) $(DLLIB) $(DEFFILE)
-        DISTCLEANDIRS = target/
         RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-        RUSTLIB = #{dllib_path(builder)}
         TARGET = #{target}
         DLLIB = $(TARGET).#{RbConfig::CONFIG["DLEXT"]}
-        TARGET_DIR = #{Dir.pwd}/target/$(RB_SYS_TARGET_DIR)
+        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)
         DEFFILE = $(TARGET_DIR)/$(TARGET)-$(arch).def
         #{base_makefile(srcdir)}
+
+        ifneq ($(RB_SYS_VERBOSE),)
+          Q = $(0=@)
+        endif
+
         #{env_vars(builder)}
 
         FORCE: ;
@@ -123,7 +146,7 @@ module RbSys
       args = ARGV.dup
       args.shift if args.first == "--"
       cargo_cmd = builder.cargo_command(dest_path, args)
-      Shellwords.join(cargo_cmd).gsub("\\=", "=").gsub(/\Acargo/, "$(CARGO)")
+      Shellwords.join(cargo_cmd).gsub("\\=", "=").gsub(/\Acargo/, "$(CARGO)").gsub(/-v=\d/, "")
     end
 
     def env_vars(builder)
@@ -142,14 +165,12 @@ module RbSys
       ENV[key] || RbConfig::MAKEFILE_CONFIG[key]
     end
 
-    def dllib_path(builder)
-      builder.cargo_dylib_path(File.join(Dir.pwd, "target"))
-    end
-
     def gsub_cargo_command!(cargo_command, builder:)
       cargo_command.gsub!(/--profile \w+/, "$(RB_SYS_CARGO_PROFILE_FLAG)")
       cargo_command.gsub!(%r{--features \S+}, "--features $(RB_SYS_CARGO_FEATURES)")
-      cargo_command.gsub!(%r{/target/\w+/}, "/target/$(RB_SYS_TARGET_DIR)/")
+      cargo_command.gsub!(%r{--target \S+}, "--target $(CARGO_BUILD_TARGET)")
+      target_dir = "target/#{builder.target}".chomp("/")
+      cargo_command.gsub!(%r{/#{target_dir}/[^/]+}, "/$(RB_SYS_CARGO_BUILD_TARGET_DIR)/$(RB_SYS_CARGO_PROFILE_DIR)")
       cargo_command
     end
   end

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.19
 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-29 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -62,7 +62,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:
   - - ">="

metadata.gz.sig

@@ -1,2 +1,2 @@
-k�|�u�ſ����v[A��|�ݐJ�%!���=��3�t�8s]	���J�A����;]��L~:	��
�yK��������W~��/�H���C��ִ�=!c�|A��7bU�2�˚% !��	Bbf#,@hS��u�m�X��Q�
-���-��^?m�<$Xy(�7[����&�HU���^m
+m�J���*SLP��W��n��Y������%Ft$!��[��QZg�h�+��r��X]�}(��������������e>*Kp�G��gR�2�J�	i���ӓ<�
�(0�p��
+�5��|M��	w�C���6K��|�R��K��"�N֤�QN\�ݖ@�i�'u^��~x�Y���&�j&a�gz�N�>{�\G5�VG-y]�s��?.��(VJv]��$�6���3,9�ɫ�!ߋu�\�(L���~