rubygems-requirements-system 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34e6edefc65d483dbf4cdd7e65aa207d72333c77daaa9a8f01783e980b902b0a
-  data.tar.gz: 389e7cb7ca4e47e340eda5d33124b5a6a6504f9394ee33f69e126501b2bfd7d3
+  metadata.gz: b9ae4c0c03cef9d3553020e858e0f3a124e4bff919111568563795765568bb1c
+  data.tar.gz: 30c19cb58a56b30c2ce09c4020678f526093bcb7636b641476a1b4b72a4af870
 SHA512:
-  metadata.gz: cf042b4cbd1c2a81c53acd09b8c068dc7092c68579c1a25dba195ac1b029f679fa12985785c477203ffc6811402f7cfeecdada8d9cbb79b3926e9a921820ae1c
-  data.tar.gz: ead6cbb4a59b00c6ecfdeedae8b2bc9cf0c04ac60da0512c78dd91f379f5be88d6024a5dd4cf05daf9dc214c0f4b44a58d8b8421dab6303b4b43e4ece628cb70
+  metadata.gz: 8d227279c190f067f1cdf6aea23e708a822eb38a8b16c9f9627aea16c13052070d05b9719cf99800415dd5b01e97e2474333f01fd660f937ab25385214347f8f
+  data.tar.gz: 30ddb08431f3b6c995d45a24e31a157b9340631c61e220bd9ecc2090145d89d8824dc8d9a5671bf33ef224480b380bd8d098847e8014f513ba5697c63dcfe998

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 0.1.5 - 2025-12-01
+
+### Improvements
+
+  * Updated bundled `pkg-config` gem to 1.6.5.
+
 ## 0.1.4 - 2025-11-26
 
 ### Improvements

data/lib/rubygems-requirements-system/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/lib/rubygems-requirements-system/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module RubyGemsRequirementsSystem
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-requirements-system
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Sutou Kouhei