pkg-config 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb7bbc85c094847a31538ce2c4ed0adfb26046c5e869e20135cdf97d560d76ee
-  data.tar.gz: 61e0d10717cf5a95b2e86274954143730a69512093a73d1202e7d2a9b5957a05
+  metadata.gz: 59d59ab5544c845936e20b50acae103136de26d613208299721a656b9fc5fc3e
+  data.tar.gz: 12033b104ff312b2efc709f21923ee52ab9547563d39967719ee881730c0f4f7
 SHA512:
-  metadata.gz: c0c1de601a893060b82f7ffd3b96541780152fe82e63ca0e9f04653d471134a0b752db24969949485be825226bd278872bdf90384368c7007c503f961cb8e688
-  data.tar.gz: 74a24c0a5d04ecf648d6c9193508bf43c4fa64144c87a69da601a745e2009e5748573467ddf8aa386e985771036e40993adb0883659e6f71baae111edd29908f
+  metadata.gz: 27e9d30f51297788fcbfeabc56bda85f7737874f439fdca4298a3bf58687c027b29a87e7103a04158f84833d40b60062578a1348aaf95a8df7d9be8dc31abb40
+  data.tar.gz: 2ab9249853fc16c5d5d768a991ec929625743fd13f50d812dd886a6ba7b4ff6871896538a4707ea77764310617f9a6b0e0048dbb3be318d3e6aaa31db3adcbab

data/NEWS

@@ -1,5 +1,11 @@
 = NEWS
 
+== 1.3.6 - 2019-03-09
+
+=== Improvements
+
+  * Added support for Homebrew environment without pkg-config formula.
+
 == 1.3.5 - 2019-03-08
 
 === Fixes

data/lib/pkg-config.rb

@@ -65,7 +65,7 @@ class PackageConfig
       pkg_config = with_config("pkg-config", default_pkg_config)
       pkg_config = Pathname.new(pkg_config)
       unless pkg_config.absolute?
-        found_pkg_config = search_pkg_config_from_path(pkg_config)
+        found_pkg_config = search_executable_from_path(pkg_config)
         pkg_config = found_pkg_config if found_pkg_config
       end
       unless pkg_config.absolute?
@@ -75,10 +75,10 @@ class PackageConfig
       pkg_config
     end
 
-    def search_pkg_config_from_path(pkg_config)
+    def search_executable_from_path(name)
       (ENV["PATH"] || "").split(SEPARATOR).each do |path|
-        try_pkg_config = Pathname(path) + pkg_config
-        return try_pkg_config if try_pkg_config.exist?
+        try_name = Pathname(path) + name
+        return try_name if try_name.executable?
       end
       nil
     end
@@ -378,29 +378,37 @@ class PackageConfig
     libdir = ENV["PKG_CONFIG_LIBDIR"]
     default_paths.unshift(libdir) if libdir
 
-    pkg_config_prefix = self.class.native_pkg_config_prefix
-    return default_paths.join(SEPARATOR) unless pkg_config_prefix
-
-    pkg_config_arch_depended_paths =
-      Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
     paths = []
-    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
+    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
+    end
     if /-darwin\d[\d\.]*\z/ =~ RUBY_PLATFORM and
         /\A(\d+\.\d+)/ =~ `sw_vers -productVersion`
       mac_os_version = $1
       homebrew_repository_candidates = []
-      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)
+      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
       else
-        homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
-        homebrew_repository_candidates << pkg_config_prefix
+        brew = self.class.__send__(:search_executable_from_path, "brew")
+        if brew
+          homebrew_repository = `brew --repository`.chomp
+          homebrew_repository_candidates << Pathname(homebrew_repository)
+        end
       end
       homebrew_repository_candidates.each do |candidate|
         path = candidate + "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"

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.3.5"
+  VERSION = "1.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit