pkg-config 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d606c8e484eaba6b266086bb721c1fd7297b00e
-  data.tar.gz: '09e2b18fc2306f19c6f8c279a13e93544e5410e7'
+  metadata.gz: b047ecbdb15bee5ee7c7449fe449e1ba07bd32fc
+  data.tar.gz: 9c4721757a5e4f42f35630a094a7e411c05bc72b
 SHA512:
-  metadata.gz: d19603dcfa45ad565d3a74dcd8ecb819afcf0e486afe67fbb4d716b06e8cf63e3bff5a0b32e8c185fb0ea34fc62c3866a69d49b7be97c1f3c6b8e142de4c5edd
-  data.tar.gz: 9b7acfbe20f12f8fb52fe877d7f54104dcb894fa5bb178fd1b451ee3e1b11ff489ba904695b17aea34e892c57cb394984163527bd31537e0d116825d7e5407d6
+  metadata.gz: 3e0769d5c077a77512f8380714168858fc65e24a79c617719163c3f216e4b32f884821fe8969d1d1dfd20e46893ed1cd086f6330fbb9cfa760e11360bc74b61b
+  data.tar.gz: c25e658f05214807fdbf13ebe2c15e803416bbe0bad8b6ec8ac3bee588ab869e178c4cfb10376c49858f3beceb7fac83a84eeb21abdfbad27d1751173cd80131

data/NEWS

@@ -1,5 +1,11 @@
 = NEWS
 
+== 1.2.2 - 2017-05-29
+
+=== Improvements
+
+  * Supported path normalization for MSYS2.
+
 == 1.2.1 - 2017-05-29
 
 === Improvements

data/lib/pkg-config.rb

@@ -213,6 +213,7 @@ class PackageConfig
     end
     all_cflags = normalize_cflags(Shellwords.split(cflags_set.join(" ")))
     path_flags, other_flags = all_cflags.partition {|flag| /\A-I/ =~ flag}
+    path_flags = normalize_path_flags(path_flags, "-I")
     path_flags = remove_duplicated_include_paths(path_flags)
     path_flags = path_flags.reject do |flag|
       flag == "-I/usr/include"
@@ -225,6 +226,23 @@ class PackageConfig
     [path_flags, other_flags]
   end
 
+  def normalize_path_flags(path_flags, prefix)
+    path_flags.collect do |path_flag|
+      path = path_flag.sub(prefix, "")
+      case RUBY_PLATFORM
+      when "x86-mingw32"
+        unless /\A[a-z]:/i === path
+          path = Dir.glob("c:/msys{32,64,*}").first + path
+        end
+      when "x64-mingw32"
+        unless /\A[a-z]:/i === path
+          path = Dir.glob("c:/msys{64,*}").first + path
+        end
+      end
+      "#{prefix}#{path}"
+    end
+  end
+
   def normalize_cflags(cflags)
     normalized_cflags = []
     enumerator = cflags.to_enum
@@ -253,6 +271,7 @@ class PackageConfig
     all_libs = [declaration("Libs")] + all_libs
     all_libs = all_libs.join(" ").gsub(/-([Ll]) /, '\1').split.uniq
     path_flags, other_flags = all_libs.partition {|flag| /\A-L/ =~ flag}
+    path_flags = normalize_path_flags(path_flags, "-L")
     path_flags = path_flags.reject do |flag|
       /\A-L\/usr\/lib(?:64|x32)?\z/ =~ flag
     end

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.2.1"
+  VERSION = "1.2.2"
 end

metadata

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