Skip to content

Commit 8f89f15

Browse files
author
Paul Phillips
committed
Update Ruby 3.2 build to 3.2.3
1 parent dc4a42f commit 8f89f15

File tree

2 files changed

+8
-26
lines changed

2 files changed

+8
-26
lines changed

config/patches/ruby/fix-ruby-xfree-for-libxml2-3.2.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

config/software/ruby.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
version('3.0.6') { source sha256: '6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e' }
7070
version('3.1.4') { source sha256: 'a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6' }
71-
version('3.2.2') { source sha256: '96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc' }
71+
version('3.2.3') { source sha256: 'af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba' }
7272

7373
source url: "https://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz"
7474

@@ -109,8 +109,13 @@
109109
# 1. Enable custom patch created by ayufan that allows to count memory allocations
110110
# per-thread. This is asked to be upstreamed as part of https://github.com/ruby/ruby/pull/3978
111111
# 2. Backport Ruby upstream patch to fix seg faults in libxml2/Nokogiri: https://bugs.ruby-lang.org/issues/19580
112-
# This has been merged for Ruby 3.3 but not yet backported: https://github.com/ruby/ruby/pull/7663
113-
patches = %w[thread-memory-allocations fix-ruby-xfree-for-libxml2]
112+
# This has been merged for Ruby 3.2.3 but not yet backported: https://github.com/ruby/ruby/pull/7663
113+
patches = if version.satisfies?('>= 3.2.3')
114+
%w[thread-memory-allocations]
115+
else
116+
%w[thread-memory-allocations fix-ruby-xfree-for-libxml2]
117+
end
118+
114119
ruby_version = Gem::Version.new(version).canonical_segments[0..1].join('.')
115120

116121
patches.each do |patch_name|

0 commit comments

Comments
 (0)