Skip to content

Commit d268bbd

Browse files
committed
Do not apply ruby 3.1.6 patch for >= 3.2.0
In Ruby 3.2.0, `configure.ac` already has the lines added by the patch: https://github.com/ruby/ruby/blob/v3_2_0/configure.ac#L369-L374 Also in `thread_pthread.h`: https://github.com/ruby/ruby/blob/v3_2_0/thread_pthread.h#L93-L100 Signed-off-by: Ben Dean <[email protected]>
1 parent 50c7885 commit d268bbd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

config/software/ruby.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
if suse? && version.satisfies?("= 3.1.4")
172172
patch source: "ruby-3.1.4-configure.patch", plevel: 1, env: patch_env
173173
end
174-
if suse? && version.satisfies?(">= 3.1.6")
174+
if suse? && version.satisfies?("~> 3.1.6")
175175
patch source: "ruby-3.1.6-configure.patch", plevel: 1, env: patch_env
176176
end
177177

@@ -188,7 +188,7 @@
188188
if rhel? && platform_version.satisfies?(">=7")
189189
if version.satisfies?("= 3.1.4")
190190
patch source: "ruby-3.1.4-configure.patch", plevel: 1, env: patch_env
191-
elsif version.satisfies?(">= 3.1.6")
191+
elsif version.satisfies?("~> 3.1.6")
192192
patch source: "ruby-3.1.6-configure.patch", plevel: 1, env: patch_env
193193
end
194194
end

0 commit comments

Comments
 (0)