mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 10:02:56 +01:00
Update to Ruby 3.2.3
Drop `fix-ruby-xfree-for-libxml2.patch` since this now ships with Ruby 3.2.3. This matches the change in https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7364. This is needed to make Omnibus builds work: https://gitlab.com/gitlab-org/gitlab/-/issues/438816
This commit is contained in:
parent
4679fb7dd7
commit
d44e49909a
3 changed files with 2 additions and 26 deletions
|
|
@ -1,23 +0,0 @@
|
|||
diff --git a/gc.c b/gc.c
|
||||
index 54400e4f6b..96d43ac8ac 100644
|
||||
--- a/gc.c
|
||||
+++ b/gc.c
|
||||
@@ -12614,8 +12614,16 @@ ruby_xrealloc2_body(void *ptr, size_t n, size_t size)
|
||||
void
|
||||
ruby_sized_xfree(void *x, size_t size)
|
||||
{
|
||||
- if (x) {
|
||||
- objspace_xfree(&rb_objspace, x, size);
|
||||
+ if (LIKELY(x)) {
|
||||
+ /* It's possible for a C extension's pthread destructor function set by pthread_key_create
|
||||
+ * to be called after ruby_vm_destruct and attempt to free memory. Fall back to mimfree in
|
||||
+ * that case. */
|
||||
+ if (LIKELY(GET_VM())) {
|
||||
+ objspace_xfree(&rb_objspace, x, size);
|
||||
+ }
|
||||
+ else {
|
||||
+ ruby_mimfree(x);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,2 +1 @@
|
|||
thread-memory-allocations
|
||||
fix-ruby-xfree-for-libxml2
|
||||
|
|
|
|||
|
|
@ -235,8 +235,8 @@ function print_ruby_args() {
|
|||
;;
|
||||
|
||||
3.2|3.2.patched)
|
||||
RUBY_VERSION="3.2.2"
|
||||
RUBY_DOWNLOAD_SHA256="96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc"
|
||||
RUBY_VERSION="3.2.3"
|
||||
RUBY_DOWNLOAD_SHA256="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba"
|
||||
;;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue