[GR-25734] Remove patches for Nokogiri native extension

PullRequest: truffleruby/4321
oracle · Jul 26, 2024 · a9674ee · a9674ee
2 parents 3cd4224 + 3c93412
commit a9674ee
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 126 deletions.
diff --git a/doc/contributor/cexts.md b/doc/contributor/cexts.md
@@ -46,11 +46,10 @@ natively.
 
 ### Compilation
 
-We compile C extensions using the standard `mkmf` tool, and `clang` compilers
-which have flags set to generate bitcode alongside machine code.
+We compile C extensions using the standard `mkmf` tool, and `gcc`/`clang` compilers.
 
 We pipe C source code through a pre-processor `lib/cext/preprocess.rb` before it
-goes to `clang` to workaround some limitations.
+goes to `gcc`/`clang` to work around some limitations.
 
 ### API functions
 

diff --git a/lib/truffle/truffle/cext_preprocessor.rb b/lib/truffle/truffle/cext_preprocessor.rb
@@ -11,7 +11,6 @@
 # rubocop:disable TruffleRuby/*
 
 require_relative 'patches/json_patches'
-require_relative 'patches/nokogiri_patches'
 require_relative 'patches/oci8_patches'
 require_relative 'patches/pg_patches'
 require_relative 'patches/tk_patches'
@@ -42,7 +41,6 @@ def self.add_gem_patches(patch_hash, gem_patches)
       end
 
       add_gem_patches(PATCHED_FILES, ::JsonPatches::PATCHES)
-      add_gem_patches(PATCHED_FILES, ::NokogiriPatches::PATCHES)
       add_gem_patches(PATCHED_FILES, ::OCI8Patches::PATCHES)
       add_gem_patches(PATCHED_FILES, ::PgPatches::PATCHES)
       add_gem_patches(PATCHED_FILES, ::TkPatches::PATCHES)

diff --git a/lib/truffle/truffle/patches/nokogiri_patches.rb b/lib/truffle/truffle/patches/nokogiri_patches.rb
diff --git a/test/truffle/cexts/test_preprocess.rb b/test/truffle/cexts/test_preprocess.rb
@@ -13,20 +13,6 @@ def test_patch(file, directory, input, expected)
   abort "expected\n#{expected}\ngot\n#{got}" unless got == expected
 end
 
-original = <<-EOF
-static int dealloc_node_i(xmlNodePtr key, xmlNodePtr node, xmlDocPtr doc)
-{
-}
-EOF
-
-modified = <<-EOF
-static int dealloc_node_i(st_data_t a, st_data_t b, st_data_t c, int errorState)
-{
-  xmlNodePtr key = (xmlNodePtr)a;
-  xmlNodePtr node = (xmlNodePtr)b;
-  xmlDocPtr doc = (xmlDocPtr)c;}
-EOF
-
 json_original = <<-EOF
 # else
 rb_str_resize(*result, RSTRING_LEN(*result));
@@ -39,10 +25,9 @@ def test_patch(file, directory, input, expected)
 # endif
 EOF
 
-test_patch 'xml_document.c', 'ext/nokogiri', original, modified
-# Should not patch other files or other gems
-test_patch 'other_file.c', 'ext/nokogiri', original, original
-test_patch 'xml_sax_parser.c', 'ext/other_gem', original, original
-
 # Tests an empty replacement
 test_patch 'parser.c', 'ext/json/ext/parser', json_original, json_patched
+
+# Should not patch other files or other gems
+test_patch 'other_file.c', 'ext/json/ext/parser', json_original, json_original
+test_patch 'parser.c', 'ext/other_gem', json_original, json_original