pkg-config 1.4.8 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2c16e146d0ccf624f6d0bb159f794819283d0a03473faa688464c85529c76a8
-  data.tar.gz: 7bf14f8e591acf8eaae6ac8859499e1bb193e098d3f1ae6fd73027992433a87e
+  metadata.gz: 2fa734326aace2a082621cebde9999bab5917805ff2148b046488471c5206db7
+  data.tar.gz: 7d6b09c7530dcc1710e12286ce7dc8fd8d5d84018c90c0708f49879b59031077
 SHA512:
-  metadata.gz: 78855df890fe391b08d049034817b8df3e238bbf584fe206dbea89c035ef3bc09651bc233c0623b09750f425afeeef0339fec0eca22555775e7f76a0bd3afdcc
-  data.tar.gz: d1baeaa40e6e8334c8b90dce84b8d53e5709164e983e267728897124f07f700051539b3cf5c347d1107c799535aa7a1aa860a9cd3fba1937147acfae05ffe585
+  metadata.gz: 3d0ccc44aed59fe08e92f7b2f3fda3979e48e4dec6356b11067c9068841b3a4483ede5d94dcd8fd7880e99a065aef466b89cb48b2905b29387ada1f95078bb8e
+  data.tar.gz: 04e1038f82ecd393e0529a312baa6d4d0c887b10a36c7089fdef0d9b3c584040f056bc2e8b1945e995f1e49f24d197d5c98ca8f1fdb2682b4b1705398da97980

data/NEWS

@@ -1,5 +1,23 @@
 = NEWS
 
+== 1.5.0 - 2022-11-23
+
+=== Improvements
+
+  * Improved the default search path. "pkg-config --variable=pc_path
+    pkg-config" is used as the default search path if it's available.
+    [Reported by Watson][GitHub:#22]
+
+== 1.4.9 - 2022-07-31
+
+This is a bug fix release of 1.4.8. All 1.4.8 users should be upgraded
+to 1.4.9.
+
+=== Fixes
+
+  * Fixed a regression bug in 1.4.8 that PkgConfig.have_package can't
+    detect nonexistent package.
+
 == 1.4.8 - 2022-07-30
 
 === Improvements

data/lib/pkg-config/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.4.8"
+  VERSION = "1.5.0"
 end

data/lib/pkg-config.rb

@@ -44,6 +44,11 @@ class PackageConfig
       @native_pkg_config_prefix ||= compute_native_pkg_config_prefix
     end
 
+    @default_path = nil
+    def default_path
+      @default_path ||= compute_default_path
+    end
+
     @custom_override_variables = nil
     def custom_override_variables
       @custom_override_variables ||= with_config("override-variables", "")
@@ -52,6 +57,7 @@ class PackageConfig
     def clear_configure_args_cache
       @native_pkg_config = nil
       @native_pkg_config_prefix = nil
+      @default_path = nil
       @custom_override_variables = nil
     end
 
@@ -138,6 +144,112 @@ class PackageConfig
         pkg_config_prefix
       end
     end
+
+    def compute_default_path
+      default_paths = nil
+      if native_pkg_config
+        pc_path = run_command(native_pkg_config.to_s,
+                              "--variable=pc_path",
+                              "pkg-config")
+        if pc_path
+          default_paths = pc_path.strip.split(SEPARATOR)
+          default_paths = nil if default_paths.empty?
+        end
+      end
+      if default_paths.nil?
+        arch_depended_path = Dir.glob("/usr/lib/*/pkgconfig")
+        default_paths = [
+          "/usr/local/lib64/pkgconfig",
+          "/usr/local/libx32/pkgconfig",
+          "/usr/local/lib/pkgconfig",
+          "/usr/local/libdata/pkgconfig",
+          "/usr/local/share/pkgconfig",
+          "/opt/local/lib/pkgconfig",
+          *arch_depended_path,
+          "/usr/lib64/pkgconfig",
+          "/usr/libx32/pkgconfig",
+          "/usr/lib/pkgconfig",
+          "/usr/libdata/pkgconfig",
+          "/usr/X11R6/lib/pkgconfig",
+          "/usr/X11R6/share/pkgconfig",
+          "/usr/X11/lib/pkgconfig",
+          "/opt/X11/lib/pkgconfig",
+          "/usr/share/pkgconfig",
+        ]
+      end
+      if Object.const_defined?(:RubyInstaller)
+        mingw_bin_path = RubyInstaller::Runtime.msys2_installation.mingw_bin_path
+        mingw_pkgconfig_path = Pathname.new(mingw_bin_path) + "../lib/pkgconfig"
+        default_paths.unshift(mingw_pkgconfig_path.cleanpath.to_s)
+      end
+      libdir = ENV["PKG_CONFIG_LIBDIR"]
+      default_paths.unshift(libdir) if libdir
+
+      paths = []
+      pkg_config_prefix = native_pkg_config_prefix
+      if pkg_config_prefix
+        pkg_config_arch_depended_paths =
+          Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
+        paths.concat(pkg_config_arch_depended_paths)
+        paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
+        paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
+        paths << (pkg_config_prefix + "lib/pkgconfig").to_s
+        paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
+        paths << (pkg_config_prefix + "share/pkgconfig").to_s
+      end
+      if /-darwin\d[\d\.]*\z/ =~ RUBY_PLATFORM and
+        /\A(\d+\.\d+)/ =~ run_command("sw_vers", "-productVersion")
+        mac_os_version = $1
+        homebrew_repository_candidates = []
+        if pkg_config_prefix
+          brew_path = pkg_config_prefix + "bin" + "brew"
+          if brew_path.exist?
+            homebrew_repository = run_command(brew_path.to_s, "--repository")
+            if homebrew_repository
+              homebrew_repository_candidates <<
+                Pathname.new(homebrew_repository.strip)
+            end
+          else
+            homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
+            homebrew_repository_candidates << pkg_config_prefix
+          end
+        end
+        brew = search_executable_from_path("brew")
+        if brew
+          homebrew_repository = run_command("brew", "--repository")
+          if homebrew_repository
+          homebrew_repository_candidates <<
+            Pathname(homebrew_repository.to_s)
+          end
+        end
+        homebrew_repository_candidates.uniq.each do |candidate|
+          pkgconfig_base_path = candidate + "Library/Homebrew/os/mac/pkgconfig"
+          path = pkgconfig_base_path + mac_os_version
+          unless path.exist?
+            path = pkgconfig_base_path + mac_os_version.gsub(/\.\d+\z/, "")
+          end
+          paths << path.to_s if path.exist?
+        end
+      end
+      paths.concat(default_paths)
+      paths.join(SEPARATOR)
+    end
+
+    def run_command(*command_line)
+      IO.pipe do |input, output|
+        begin
+          pid = spawn(*command_line,
+                      out: output,
+                      err: File::NULL)
+          output.close
+          _, status = Process.waitpid2(pid)
+          return nil unless status.success?
+          input.read
+        rescue SystemCallError
+          nil
+        end
+      end
+    end
   end
 
   attr_reader :name
@@ -155,7 +267,7 @@ class PackageConfig
     end
     @options = options
     path = @options[:path] || ENV["PKG_CONFIG_PATH"]
-    @paths = [path, guess_default_path].compact.join(SEPARATOR).split(SEPARATOR)
+    @paths = [path, self.class.default_path].compact.join(SEPARATOR).split(SEPARATOR)
     @paths.unshift(*(@options[:paths] || []))
     @paths = normalize_paths(@paths)
     @msvc_syntax = @options[:msvc_syntax]
@@ -425,79 +537,6 @@ class PackageConfig
     end
   end
 
-  def guess_default_path
-    arch_depended_path = Dir.glob("/usr/lib/*/pkgconfig")
-    default_paths = [
-      "/usr/local/lib64/pkgconfig",
-      "/usr/local/libx32/pkgconfig",
-      "/usr/local/lib/pkgconfig",
-      "/usr/local/libdata/pkgconfig",
-      "/usr/local/share/pkgconfig",
-      "/opt/local/lib/pkgconfig",
-      *arch_depended_path,
-      "/usr/lib64/pkgconfig",
-      "/usr/libx32/pkgconfig",
-      "/usr/lib/pkgconfig",
-      "/usr/libdata/pkgconfig",
-      "/usr/X11R6/lib/pkgconfig",
-      "/usr/X11R6/share/pkgconfig",
-      "/usr/X11/lib/pkgconfig",
-      "/opt/X11/lib/pkgconfig",
-      "/usr/share/pkgconfig",
-    ]
-    if Object.const_defined?(:RubyInstaller)
-      mingw_bin_path = RubyInstaller::Runtime.msys2_installation.mingw_bin_path
-      mingw_pkgconfig_path = Pathname.new(mingw_bin_path) + "../lib/pkgconfig"
-      default_paths.unshift(mingw_pkgconfig_path.cleanpath.to_s)
-    end
-    libdir = ENV["PKG_CONFIG_LIBDIR"]
-    default_paths.unshift(libdir) if libdir
-
-    paths = []
-    pkg_config_prefix = self.class.native_pkg_config_prefix
-    if pkg_config_prefix
-      pkg_config_arch_depended_paths =
-        Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
-      paths.concat(pkg_config_arch_depended_paths)
-      paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
-      paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
-      paths << (pkg_config_prefix + "lib/pkgconfig").to_s
-      paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
-      paths << (pkg_config_prefix + "share/pkgconfig").to_s
-    end
-    if /-darwin\d[\d\.]*\z/ =~ RUBY_PLATFORM and
-        /\A(\d+\.\d+)/ =~ `sw_vers -productVersion`
-      mac_os_version = $1
-      homebrew_repository_candidates = []
-      if pkg_config_prefix
-        brew_path = pkg_config_prefix + "bin" + "brew"
-        if brew_path.exist?
-          escaped_brew_path = Shellwords.escape(brew_path.to_s)
-          homebrew_repository = `#{escaped_brew_path} --repository`.chomp
-          homebrew_repository_candidates << Pathname.new(homebrew_repository)
-        else
-          homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
-          homebrew_repository_candidates << pkg_config_prefix
-        end
-      end
-      brew = self.class.__send__(:search_executable_from_path, "brew")
-      if brew
-        homebrew_repository = `brew --repository`.chomp
-        homebrew_repository_candidates << Pathname(homebrew_repository)
-      end
-      homebrew_repository_candidates.uniq.each do |candidate|
-        pkgconfig_base_path = candidate + "Library/Homebrew/os/mac/pkgconfig"
-        path = pkgconfig_base_path + mac_os_version
-        unless path.exist?
-          path = pkgconfig_base_path + mac_os_version.gsub(/\.\d+\z/, "")
-        end
-        paths << path.to_s if path.exist?
-      end
-    end
-    paths.concat(default_paths)
-    paths.join(SEPARATOR)
-  end
-
   def required_packages
     collect_requires do |package|
       package.requires
@@ -598,13 +637,14 @@ module PKGConfig
       message << " version (>= #{major}.#{minor}.#{micro})"
     end
     major ||= 0
-    enough_version = checking_for(checking_message(message), "%s") do
+    result = checking_for(checking_message(message), "%s") do
       if check_version?(pkg, major, minor, micro)
         "yes (#{modversion(pkg)})"
       else
         "no"
       end
     end
+    enough_version = (result != "no")
     if enough_version
       libraries = libs_only_l(pkg)
       dldflags = libs(pkg)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.5.0
 platform: ruby
 authors:
 - Kouhei Sutou
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-30 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -74,7 +74,7 @@ licenses:
 - LGPLv2+
 metadata:
   msys2_mingw_dependencies: pkg-config
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.0.dev
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A pkg-config implementation for Ruby
 test_files: