diff --git a/config/patches/ruby/ruby-win32_resolv.patch b/config/patches/ruby/ruby-win32_resolv.patch index d0d98c11e..b4592f2f1 100644 --- a/config/patches/ruby/ruby-win32_resolv.patch +++ b/config/patches/ruby/ruby-win32_resolv.patch @@ -1,5 +1,5 @@ ---- ext\win32\lib\win32\resolv.rb.org 2024-03-25 19:48:15 -+++ ext\win32\lib\win32\resolv.rb 2024-03-25 19:49:01 +--- ext/win32/lib/win32/resolv.rb.org 2024-03-25 19:48:15 ++++ ext/win32/lib/win32/resolv.rb 2024-03-25 19:49:01 @@ -4,7 +4,7 @@ =end diff --git a/config/software/ruby.rb b/config/software/ruby.rb index ba14d96ac..dc7edad32 100644 --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -162,11 +162,13 @@ # UTF-16LE format and we need UTF-8. # Here we patch the Ruby Win32/Reolv.rb file to make reloading the Win32::Registry class # conditional and therefore prevent the monkeypatch from being overwritten. + + puts "************************ PATCH ENV ***************************" + puts patch_env + puts "********************** END PATCH ENV ************************" + if windows? && version.satisfies?("~> 3.0.0") - puts "************************ PATCH ENV ***************************" - puts patch_env - puts "********************** END PATCH ENV ************************" - patch source: "ruby-win32_resolv.patch", plevel: 1, env: patch_env + patch source: "ruby-win32_resolv.patch", plevel: 0, env: patch_env end # RHEL6 has a base compiler that does not support -fstack-protector-strong, but we