rb_sys 0.9.128 → 0.9.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4907306eece620077a2b68e2b6f33a13a4e7c310e8937d1655229ff4cbc62605
-  data.tar.gz: bcca23169c98229da0467fffe834ac6de098261cea82fb7e90c6cb0273c048b8
+  metadata.gz: e3e0c8b8dba44b339c68919b055cbaceacd426347771a15e288c0ce30dba4ae4
+  data.tar.gz: 87c5f0322d8ca0c6f91b8c4508fc6ee76a3581721d8c2e4299631fcbe9ebdb75
 SHA512:
-  metadata.gz: 89690dc28b0a42302744554a4e9aac8c0573c88a016ffc67e4aed3873de3fad862947613403e46e711650eebf055751542473db0a64ce60b5c73134ac7ef9162
-  data.tar.gz: 10d2bd2e67bd9e937b300c5deb451c8d5fbdf88d39399815b6b7f7cdeb3c69a140048ed6c57b6d7a82a7a840fc47b66f04379a9c1273be200af383ee2f4923a0
+  metadata.gz: c513c9b21e6a025b1779a45559f7da443f7d3464e35d8db8c3f664a1757d051c6b1c8688081d4e71f93c5fe9f57592d3815d1194296ad02ea3e862c83c727998
+  data.tar.gz: 70a6da32dc974b268459bd767b9073ed1ee2fbe5dc876b710433a31c92b8a449618d0ad69e5d6a7b8b2660d994b24bb09ae581f5c43f679c5b649371f0cc3e0f

data/lib/rb_sys/error.rb

@@ -32,7 +32,7 @@ module RbSys
           - Make sure `cargo` is installed and in your PATH
       MSG
 
-      if !stderr.empty?
+      if stderr && !stderr.empty?
         indented_stderr = stderr.lines.map { |line| "  #{line}" }.join
         msg << "Stderr from `cargo metadata` was:\n#{indented_stderr}"
       end

data/lib/rb_sys/extensiontask.rb

@@ -29,8 +29,8 @@ module RbSys
     def init(name = nil, gem_spec = nil)
       super(name, lint_gem_spec(name, gem_spec))
 
-      @orginal_ext_dir = @ext_dir
-      @ext_dir = cargo_metadata.manifest_directory
+      @original_ext_dir = @ext_dir
+      @ext_dir = cargo_manifest_directory
       @source_pattern = nil
       @compiled_pattern = "*.{obj,so,bundle,dSYM}"
       @cross_compile = ENV.key?("RUBY_TARGET")
@@ -61,7 +61,7 @@ module RbSys
     end
 
     def extconf
-      File.join(cargo_metadata.manifest_directory, "extconf.rb")
+      File.join(ext_dir, "extconf.rb")
     end
 
     def binary(_platf)
@@ -86,6 +86,8 @@ module RbSys
     end
 
     def target_directory
+      return fallback_target_directory if @cargo_metadata_unavailable
+
       cargo_metadata.target_directory
     end
 
@@ -104,7 +106,7 @@ module RbSys
     def define_env_tasks
       task "rb_sys:env:default" do
         ENV["RB_SYS_CARGO_TARGET_DIR"] ||= target_directory
-        ENV["RB_SYS_CARGO_MANIFEST_DIR"] ||= cargo_metadata.manifest_directory
+        ENV["RB_SYS_CARGO_MANIFEST_DIR"] ||= File.expand_path(ext_dir)
         ENV["RB_SYS_CARGO_PROFILE"] ||= "release"
       end
 
@@ -129,6 +131,33 @@ module RbSys
 
     private
 
+    def cargo_manifest_directory
+      cargo_metadata.manifest_directory
+    rescue CargoMetadataError
+      raise unless force_install_rust_toolchain?
+
+      # Let the generated Makefile install Cargo before the extension is built.
+      @cargo_metadata_unavailable = true
+      File.expand_path(configured_extension_directory)
+    end
+
+    def configured_extension_directory
+      extension = @gem_spec&.extensions&.find do |path|
+        %w[Cargo.toml extconf.rb].include?(File.basename(path))
+      end
+
+      extension ? File.dirname(extension) : @original_ext_dir
+    end
+
+    def fallback_target_directory
+      File.expand_path(ENV["RB_SYS_CARGO_TARGET_DIR"] || ENV["CARGO_TARGET_DIR"] || "target")
+    end
+
+    def force_install_rust_toolchain?
+      value = ENV["RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN"]
+      value && value != "false"
+    end
+
     def lint_gem_spec(name, gs)
       gem_spec = case gs
       when :undefined

data/lib/rb_sys/mkmf.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rubygems/ext"
+require "open3"
 require "shellwords"
 require_relative "cargo_builder"
 require_relative "mkmf/config"
@@ -217,7 +218,7 @@ module RbSys
       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 \S+}, "--target $(CARGO_BUILD_TARGET)")
-      cargo_command.gsub!(/--target-dir (?:(?!--).)+/, "--target-dir $(RB_SYS_CARGO_TARGET_DIR) ")
+      cargo_command.gsub!(/--target-dir (?:\\.|[^[:space:]])+/, "--target-dir $(RB_SYS_CARGO_TARGET_DIR)")
       cargo_command
     end
 
@@ -297,7 +298,7 @@ module RbSys
         return
       end
 
-      %($(Q) #{tool} -id "" $(DLLIB))
+      %($(Q) #{tool} -id "$(notdir $(DLLIB))" $(DLLIB))
     end
 
     def if_eq_stmt(a, b)
@@ -358,14 +359,36 @@ module RbSys
       end
     end
 
-    def try_load_bundled_libclang(_builder)
+    def try_load_bundled_libclang(builder)
       require "libclang"
       assert_libclang_version_valid!
-      export_env("LIBCLANG_PATH", Libclang.libdir)
+
+      config = [export_env("LIBCLANG_PATH", Libclang.libdir)]
+      if (include_dir = compiler_builtin_include_dir(builder))
+        clang_args = Shellwords.join(["-isystem", include_dir])
+        config << conditional_assign("BINDGEN_EXTRA_CLANG_ARGS", clang_args, export: true)
+      end
+      config.join("\n")
     rescue LoadError
       # If we can't load the bundled libclang, just continue
     end
 
+    def compiler_builtin_include_dir(builder)
+      cc = env_or_makefile_config("CC", builder)
+      return unless cc
+
+      stdout, _stderr, status = Open3.capture3(*Shellwords.split(cc), "-print-file-name=include")
+      return unless status.success?
+
+      path = stdout.strip
+      return if path.empty? || path == "include"
+
+      include_dir = File.expand_path(path)
+      include_dir if Dir.exist?(include_dir)
+    rescue Errno::ENOENT
+      nil
+    end
+
     def assert_libclang_version_valid!
       libclang_version = Gem::Version.new(Libclang.version)
 

data/lib/rb_sys/toolchain_info/data.rb

@@ -5,6 +5,6 @@
 module RbSys
   class ToolchainInfo
     # @private
-    DATA = {"arm-linux" => {"rust-target" => "arm-unknown-linux-gnueabihf", "rake-compiler-dock" => {"cc" => "arm-linux-gnueabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "aarch64-linux" => {"aliases" => ["aarch64-linux-gnu", "aarch64-unknown-linux-gnu"], "rust-target" => "aarch64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "aarch64-linux-gnu-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "aarch64-linux-musl" => {"rust-target" => "aarch64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "aarch64-linux-musl-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "arm64-darwin" => {"rust-target" => "aarch64-apple-darwin", "rake-compiler-dock" => {"cc" => "aarch64-apple-darwin-clang"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "x64-mingw-ucrt" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "aarch64-mingw-ucrt" => {"rust-target" => "aarch64-pc-windows-gnullvm", "rake-compiler-dock" => {"cc" => "aarch64-w64-mingw32-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x64-mingw32" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86-linux" => {"rust-target" => "i686-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "i686-redhat-linux-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86-mingw32" => {"rust-target" => "i686-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "i686-w64-mingw32-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86_64-darwin" => {"rust-target" => "x86_64-apple-darwin", "rake-compiler-dock" => {"cc" => "x86_64-apple-darwin-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux" => {"aliases" => ["x86_64-linux-gnu", "x86_64-unknown-linux-gnu"], "rust-target" => "x86_64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "x86_64-redhat-linux-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux-musl" => {"rust-target" => "x86_64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "x86_64-unknown-linux-musl-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}}
+    DATA = {"arm-linux" => {"rust-target" => "arm-unknown-linux-gnueabihf", "rake-compiler-dock" => {"cc" => "arm-linux-gnueabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "arm-linux-musl" => {"rust-target" => "arm-unknown-linux-musleabihf", "rake-compiler-dock" => {"cc" => "arm-linux-musleabihf-gcc"}, "docker-platform" => "linux/arm/v7", "supported" => true}, "aarch64-linux" => {"aliases" => ["aarch64-linux-gnu", "aarch64-unknown-linux-gnu"], "rust-target" => "aarch64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "aarch64-linux-gnu-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "aarch64-linux-musl" => {"rust-target" => "aarch64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "aarch64-linux-musl-gcc"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "arm64-darwin" => {"rust-target" => "aarch64-apple-darwin", "rake-compiler-dock" => {"cc" => "aarch64-apple-darwin-clang"}, "docker-platform" => "linux/arm64/v8", "supported" => true}, "x64-mingw-ucrt" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "aarch64-mingw-ucrt" => {"rust-target" => "aarch64-pc-windows-gnullvm", "rake-compiler-dock" => {"cc" => "aarch64-w64-mingw32-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x64-mingw32" => {"rust-target" => "x86_64-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "x86_64-windows-gnu-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86-linux" => {"rust-target" => "i686-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "i686-redhat-linux-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86-mingw32" => {"rust-target" => "i686-pc-windows-gnu", "rake-compiler-dock" => {"cc" => "i686-w64-mingw32-gcc"}, "docker-platform" => "linux/i386", "supported" => false}, "x86_64-darwin" => {"rust-target" => "x86_64-apple-darwin", "rake-compiler-dock" => {"cc" => "x86_64-apple-darwin-clang"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux" => {"aliases" => ["x86_64-linux-gnu", "x86_64-unknown-linux-gnu"], "rust-target" => "x86_64-unknown-linux-gnu", "rake-compiler-dock" => {"cc" => "x86_64-redhat-linux-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}, "x86_64-linux-musl" => {"rust-target" => "x86_64-unknown-linux-musl", "rake-compiler-dock" => {"cc" => "x86_64-unknown-linux-musl-gcc"}, "docker-platform" => "linux/amd64", "supported" => true}}
   end
 end

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.128
+  version: 0.9.130
 platform: ruby
 authors:
 - Ian Ker-Seymer