From d5f2a83610f034d1428957740df4ddfeafaa2742 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sun, 5 Jan 2025 21:42:36 -0500
Subject: [PATCH 1/2] dep: bump rake-compiler-dock to 1.8.0

---
 .cross_rubies | 36 ++++++++++++++++++------------------
 Gemfile       |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.cross_rubies b/.cross_rubies
index ea343b5216..f2d86e381b 100644
--- a/.cross_rubies
+++ b/.cross_rubies
@@ -1,21 +1,21 @@
-3.1.0:aarch64-linux-gnu
-3.1.0:aarch64-linux-musl
-3.1.0:arm-linux-gnu
-3.1.0:arm-linux-musl
-3.1.0:arm64-darwin
-3.1.0:x64-mingw-ucrt
-3.1.0:x86_64-darwin
-3.1.0:x86_64-linux-gnu
-3.1.0:x86_64-linux-musl
-3.2.0:aarch64-linux-gnu
-3.2.0:aarch64-linux-musl
-3.2.0:arm-linux-gnu
-3.2.0:arm-linux-musl
-3.2.0:arm64-darwin
-3.2.0:x64-mingw-ucrt
-3.2.0:x86_64-darwin
-3.2.0:x86_64-linux-gnu
-3.2.0:x86_64-linux-musl
+3.1.6:aarch64-linux-gnu
+3.1.6:aarch64-linux-musl
+3.1.6:arm-linux-gnu
+3.1.6:arm-linux-musl
+3.1.6:arm64-darwin
+3.1.6:x64-mingw-ucrt
+3.1.6:x86_64-darwin
+3.1.6:x86_64-linux-gnu
+3.1.6:x86_64-linux-musl
+3.2.6:aarch64-linux-gnu
+3.2.6:aarch64-linux-musl
+3.2.6:arm-linux-gnu
+3.2.6:arm-linux-musl
+3.2.6:arm64-darwin
+3.2.6:x64-mingw-ucrt
+3.2.6:x86_64-darwin
+3.2.6:x86_64-linux-gnu
+3.2.6:x86_64-linux-musl
 3.3.5:aarch64-linux-gnu
 3.3.5:aarch64-linux-musl
 3.3.5:arm-linux-gnu
diff --git a/Gemfile b/Gemfile
index 8f7bbc8b98..229910cfb2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ group :development do
 
   # building extensions
   gem "rake-compiler", "1.2.8"
-  gem "rake-compiler-dock", "1.7.1"
+  gem "rake-compiler-dock", "1.8.0"
 
   # parser generator
   gem "rexical", "1.0.8"

From dbfd8f8c42a2977d5ce3a3a92bb00a5e6a01b731 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Mon, 6 Jan 2025 08:13:13 -0500
Subject: [PATCH 2/2] ext: update for rake-compiler-dock 1.8.0

- drop adding the flat namespace linker flag which rcd injects for us
- detect the need for darwin linker hack based on linker flags, not ruby version
---
 ext/nokogiri/extconf.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ext/nokogiri/extconf.rb b/ext/nokogiri/extconf.rb
index bf3010d334..78b2acb3e2 100644
--- a/ext/nokogiri/extconf.rb
+++ b/ext/nokogiri/extconf.rb
@@ -627,7 +627,7 @@ def do_clean
 def needs_darwin_linker_hack
   config_cross_build? &&
     darwin? &&
-    Gem::Requirement.new("~> 3.2").satisfied_by?(Gem::Version.new(RbConfig::CONFIG["ruby_version"].split("+").first))
+    RbConfig::MAKEFILE_CONFIG["EXTDLDFLAGS"].include?("-bundle_loader")
 end
 
 #
@@ -764,10 +764,6 @@ def needs_darwin_linker_hack
   cross_build_p = config_cross_build?
   message "Cross build is #{cross_build_p ? "enabled" : "disabled"}.\n"
 
-  if needs_darwin_linker_hack
-    append_ldflags("-Wl,-flat_namespace")
-  end
-
   require "yaml"
   dependencies = YAML.load_file(File.join(PACKAGE_ROOT_DIR, "dependencies.yml"))