pkg-config 1.6.6 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2e29eff2da53b36ec5eb75c9592ed4870d7a73a516cd729422a457fe70ad7da
-  data.tar.gz: 26c8d162c9278406471ba4b80a8362453eaafef00250fc081e083df590e69718
+  metadata.gz: 9247c36102e80ca429636e25d28b24b14573486f0825d1d6764f85a09fc55681
+  data.tar.gz: 8dc70f0d2fb458c96b78b4db348e119be01c9c170e16b969795e6e435a3dca5b
 SHA512:
-  metadata.gz: 9ca2fec23f2f9a20cb7e78e8c89125a49193b2683d351281893c348e763321dce2dfa216db9b22c867a703b090df420bed6668d1880c4cf9464fce1eec29da57
-  data.tar.gz: e978241d3ad1e15438c0dfa7d5abc28c596dd1b000a1572baa09788eb4b4c097b49d200872780538a4c77ca7f5d71f83cf211e4a9271b26ab7d024c58e3edd7c
+  metadata.gz: 4c4d698e50f0f74dd4411fe8443e2c190fb1b1ae04e36c8341be38d997430977ffcb6ae3b7871fa4f53de367e3b08c9ec2305df504e9a60fe8a078843ee4d3e6
+  data.tar.gz: 1b01d95584b9feb2417852a11c8bce55ae12b6c703c8aea9f3fe71185f640fd379a09176172eee9eb1f981dc4851f6fb11e6e8145351be3c5a54d429b18dce1d

data/NEWS.md

@@ -1,5 +1,18 @@
 # NEWS
 
+## 1.6.7 - 2026-11-04
+
+### Improvements
+
+  * Improved `pkgconf`/`pkg-config` search algorithm: Search `pkgconf`
+    and `pkg-config` in each `PATH` entry.
+    * [apache/arrow#55366](https://github.com/apache/arrow/issues/55366)
+    * Reported by tadeja
+
+### Thanks
+
+  * tadeja
+
 ## 1.6.6 - 2026-10-19
 
 ### Improvements

data/lib/pkg-config.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2025  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2008-2026  Sutou Kouhei <kou@cozmixng.org>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,7 @@ require "rbconfig"
 require "shellwords"
 
 module PKGConfig
-  VERSION = "1.6.6"
+  VERSION = "1.6.7"
 
   @@paths = []
   @@override_variables = {}
@@ -187,8 +187,6 @@ class PackageConfig
       candidates = [
         with_config("pkg-config"),
         ENV["PKG_CONFIG"],
-        "pkgconf#{exeext}",
-        "pkg-config#{exeext}",
       ].compact
       candidates.each do |pkg_config|
         pkg_config = Pathname.new(pkg_config)
@@ -202,13 +200,19 @@ class PackageConfig
           return found_pkg_config if found_pkg_config
         end
       end
-      Pathname.new(candidates[0])
+      # Search both names in each PATH entry to respect PATH order.
+      default_candidates = ["pkgconf#{exeext}", "pkg-config#{exeext}"]
+      found_pkg_config = search_executable_from_path(*default_candidates)
+      return found_pkg_config if found_pkg_config
+      Pathname.new(candidates[0] || default_candidates[0])
     end
 
-    def search_executable_from_path(name)
+    def search_executable_from_path(*names)
       (ENV["PATH"] || "").split(SEPARATOR).each do |path|
-        try_name = Pathname(path) + name
-        return try_name if try_name.executable?
+        names.each do |name|
+          try_name = Pathname(path) + name
+          return try_name if try_name.executable?
+        end
       end
       nil
     end

data/test/test-pkg-config.rb

@@ -1,5 +1,7 @@
 require "mkmf"
+require "fileutils"
 require "tempfile"
+require "tmpdir"
 
 require "pkg-config"
 
@@ -344,4 +346,54 @@ Cflags: -I${includedir}/my-package
                                       "-DFOO", "-Wall", "-Wl,--as-needed"]))
     end
   end
+
+  sub_test_case(".native_pkg_config") do
+    def setup
+      super
+      original_path = ENV["PATH"]
+      original_pkg_config = ENV["PKG_CONFIG"]
+      begin
+        ENV.delete("PKG_CONFIG")
+        PackageConfig.clear_configure_args_cache
+        Dir.mktmpdir do |tmp_dir|
+          @tmp_dir = tmp_dir
+          yield
+        end
+      ensure
+        ENV["PATH"] = original_path
+        ENV["PKG_CONFIG"] = original_pkg_config
+        PackageConfig.clear_configure_args_cache
+      end
+    end
+
+    def create_executable(dir, name)
+      dir = File.join(@tmp_dir, dir)
+      FileUtils.mkdir_p(dir)
+      path = File.join(dir, "#{name}#{RbConfig::CONFIG["EXEEXT"]}")
+      File.write(path, "")
+      FileUtils.chmod(0755, path)
+      Pathname(path)
+    end
+
+    def native_pkg_config
+      PackageConfig.native_pkg_config
+    end
+
+    def test_prefer_earlier_path_entry
+      pkg_config = create_executable("conda", "pkg-config")
+      pkgconf = create_executable("homebrew", "pkgconf")
+      ENV["PATH"] = [
+        File.dirname(pkg_config),
+        File.dirname(pkgconf),
+      ].join(File::PATH_SEPARATOR)
+      assert_equal(pkg_config, native_pkg_config)
+    end
+
+    def test_prefer_pkgconf_in_same_path_entry
+      create_executable("bin", "pkg-config")
+      pkgconf = create_executable("bin", "pkgconf")
+      ENV["PATH"] = File.dirname(pkgconf)
+      assert_equal(pkgconf, native_pkg_config)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
 platform: ruby
 authors:
 - Sutou Kouhei