pkg-config 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aa00fc6e840f6d61f9d63a7455da3a9a6fd4febfb4d9909508aa5f32fcbd838
-  data.tar.gz: 318ecf2df122cbaa86fc972fbd32017d8afe938cc0b0dc492cf75c6d0706aaa6
+  metadata.gz: 0a4a54b361004652d84f50b2d4f2cfaaf447ffd2fc97c44490ed7c7751763721
+  data.tar.gz: 3ae709328a845092794bca9d2753e5d7867170b5832d7f85023c0692ec1e8178
 SHA512:
-  metadata.gz: 077e55fa2ddf6791ae05f24012c29bb3cdb126e713d5f07c58e204facc62885a33901cea3fd5985f4e64adfa3acab2e40a893250a0095675fea416c0b302b186
-  data.tar.gz: 5b0fc63366cd7dd3e41185fb35338547b407ad6a0ba0e2018e59e072a5cbc2a83ed22a23ab172e0b5a0506d07e29ce256aee5528a1c7cec01787240554483377
+  metadata.gz: 748e225bef3d590013e8bf3efcc2c0422d6d2a802a65f104f15feebd01bcf526d29b0909b922d444b261c5354a2b6101d549871867f7e5bb95c0bd01da12ba48
+  data.tar.gz: 0203aee2b542ca94a0dbf18e7515ff73339b3910931eeb209d19e791f30a63d8a70bf36c500271f68b73a2045abfc60fe6c0a5727e265df01843c893c95e7936

data/NEWS.md

@@ -1,5 +1,17 @@
 # NEWS
 
+## 1.6.5 - 2025-12-01
+
+### Improvements
+
+  * Improved pkgconf compatibility: Removed duplicated `-D`/`-W` flags.
+    * [ruby-gnome/pkg-config#43](https://github.com/ruby-gnome/pkg-config/issues/43)
+    * Patch by takuya kodama
+
+### Thanks
+
+  * takuya kodama
+
 ## 1.6.4 - 2025-09-03
 
 ### Improvements

data/lib/pkg-config.rb

@@ -19,7 +19,7 @@ require "rbconfig"
 require "shellwords"
 
 module PKGConfig
-  VERSION = "1.6.4"
+  VERSION = "1.6.5"
 
   @@paths = []
   @@override_variables = {}
@@ -545,6 +545,7 @@ class PackageConfig
         flag.gsub(/\A-I/, "/I")
       end
     end
+    other_flags = merge_back_cflags(other_flags)
     [path_flags, other_flags]
   end
 
@@ -579,6 +580,32 @@ class PackageConfig
     normalized_cflags
   end
 
+  # Implementing behavior compatible with pkgconf's pkgconf_fragment_copy().
+  # This is not a complete reproduction yet, but the goal is to stay compatible.
+  # https://github.com/pkgconf/pkgconf/blob/pkgconf-2.5.1/libpkgconf/fragment.c#L381-L416
+  def merge_back_cflags(cflags)
+    merge_backed_cflags = []
+    cflags.each do |cflag|
+      if mergeable_flag?(cflag)
+        # NOTE: This may be slow because this checks merge_back_cflags N times
+        # (where N is the number of mergeable flags).
+        merge_backed_cflags.delete(cflag)
+      end
+      merge_backed_cflags << cflag
+    end
+    merge_backed_cflags
+  end
+
+  def mergeable_flag?(flag)
+    return false unless flag.start_with?("-")
+    return true if flag.start_with?("-D")
+    if flag.start_with?("-W")
+      return false if flag.start_with?("-Wa,", "-Wl,", "-Wp,")
+      return true
+    end
+    false
+  end
+
   def collect_libs
     target_packages = [*required_packages, self]
     libs_set = []

data/test/test-pkg-config.rb

@@ -314,4 +314,34 @@ Cflags: -I${includedir}/my-package
                    parse_requires("fribidi = 1.0"))
     end
   end
+
+  sub_test_case("#merge_back_cflags") do
+    def merge_back_cflags(cflags)
+      @glib.__send__(:merge_back_cflags, cflags)
+    end
+
+    def test_d
+      assert_equal(["-DFOO"],
+                   merge_back_cflags(["-DFOO", "-DFOO"]))
+    end
+
+    def test_w
+      assert_equal(["-Wno-unknown-warning-option"],
+                   merge_back_cflags(["-Wno-unknown-warning-option",
+                                      "-Wno-unknown-warning-option"]))
+    end
+
+    def test_wa_wl_wp
+      assert_equal(["-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO",
+                    "-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO"],
+                   merge_back_cflags(["-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO",
+                                      "-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO"]))
+    end
+
+    def test_mixed
+      assert_equal(["-Wl,--as-needed", "-DFOO", "-Wall", "-Wl,--as-needed"],
+                   merge_back_cflags(["-DFOO", "-Wall", "-Wl,--as-needed",
+                                      "-DFOO", "-Wall", "-Wl,--as-needed"]))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Sutou Kouhei
@@ -29,7 +29,7 @@ homepage: https://github.com/ruby-gnome/pkg-config
 licenses:
 - LGPLv2+
 metadata:
-  msys2_mingw_dependencies: pkg-config
+  msys2_mingw_dependencies: pkgconf
 rdoc_options: []
 require_paths:
 - lib