From 77cf55f1eeb69deef50f0d2beabb17aac12991b2 Mon Sep 17 00:00:00 2001
From: Jeff Dickey <216188+jdx@users.noreply.github.com>
Date: Sat, 11 Jul 2026 19:16:33 -0500
Subject: [PATCH 1/2] fix: clear build-time pkg-config path from rbconfig

---
 libexec/package.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libexec/package.rb b/libexec/package.rb
index 5a7a1f1..6a7b4d0 100755
--- a/libexec/package.rb
+++ b/libexec/package.rb
@@ -583,6 +583,8 @@ module RbConfig
           config["AR"] = "ar"
           config["NM"] = "nm"
           config["RANLIB"] = "ranlib"
+          # Let mkmf honor ENV["PKG_CONFIG"] or find pkg-config on PATH.
+          config["PKG_CONFIG"] = ""
           %w[CFLAGS CPPFLAGS CXXFLAGS XCFLAGS XCXXFLAGS LDFLAGS DLDFLAGS LIBS LDSHARED LDSHAREDXX DLDSHARED cflags cxxflags hardenflags warnflags].each do |key|
             next unless config[key]
             scrub_patterns.each { |pattern| config[key] = config[key].gsub(pattern, "") }

From bf60044a9a43b5efef17d49b5372e86e60974397 Mon Sep 17 00:00:00 2001
From: Jeff Dickey <216188+jdx@users.noreply.github.com>
Date: Sat, 11 Jul 2026 19:23:16 -0500
Subject: [PATCH 2/2] fix: remove pkg-config from portable rbconfig

---
 libexec/package.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libexec/package.rb b/libexec/package.rb
index 6a7b4d0..0508a57 100755
--- a/libexec/package.rb
+++ b/libexec/package.rb
@@ -584,7 +584,7 @@ module RbConfig
           config["NM"] = "nm"
           config["RANLIB"] = "ranlib"
           # Let mkmf honor ENV["PKG_CONFIG"] or find pkg-config on PATH.
-          config["PKG_CONFIG"] = ""
+          config.delete("PKG_CONFIG")
           %w[CFLAGS CPPFLAGS CXXFLAGS XCFLAGS XCXXFLAGS LDFLAGS DLDFLAGS LIBS LDSHARED LDSHAREDXX DLDSHARED cflags cxxflags hardenflags warnflags].each do |key|
             next unless config[key]
             scrub_patterns.each { |pattern| config[key] = config[key].gsub(pattern, "") }