macports/macports-ports
0
0
Fork 0
mirror of https://github.com/macports/macports-ports.git synced 2026-07-12 18:20:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

ruby32: update to 3.2.11

Browse Source 
See:
https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/

Also disables the unnecessary compiler wrapper, and adds a warning
about tests.

TESTED:
Built successfully on OSX 10.4-10.6 i386, 10.5-12.x x86_64, and
11.x-26.x arm64.  Included all variants compatible with available
dependencies on the respective platforms.
This commit is contained in:
Fred Wright
2026-03-26 20:30:48 -07:00
committed by Renee Otten
parent bb20fc3445
commit f1dddc92d1
2 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/ruby32/Portfile
+17 -5
View File
@@ -16,7 +16,7 @@ legacysupport.newest_darwin_requires_legacy 14
# This property should be preserved.
set ruby_ver 3.2
set ruby_patch 10
set ruby_patch 11
set ruby_ver_nodot [string map {. {}} ${ruby_ver}]
name ruby${ruby_ver_nodot}
version ${ruby_ver}.${ruby_patch}
@@ -41,9 +41,9 @@ master_sites ruby:${ruby_ver}
distname ruby-${version}
dist_subdir ruby${ruby_ver_nodot}
checksums rmd160 a5a56e983fb89b95f6efaf26869a6cde3ef39d8b \
sha256 880acb05e08da8c559c56a13e512bae1b472da67c72ebb750c765f9c2134e689 \
size 19983731
checksums rmd160 7e54815e44c1293effcc370f9b6b0e03fee619f1 \
sha256 b3eeabd6636f334531db3ffdc3229eb05e524740e6c84fdc043720573cf2f8b2 \
size 19984344
# Universal builds don't currently work, including via the approach used
# in ruby30.
@@ -70,7 +70,7 @@ select.file ${filespath}/ruby${ruby_ver_nodot}
# patch-sources.diff: fixes for various issues.
# This includes the 'gem' versioning fix formerly handled via reinplace.
#
# This diff is from v3_2_10 vs. macports-3_2_10.
# This diff is from v3_2_11 vs. macports-3_2_11.
#
patchfiles-append patch-sources.diff
@@ -108,6 +108,11 @@ if {[string match *clang* ${configure.compiler}] \
configure.cxxflags-append -std=c++03
}
# The openssl PG brings in the unnecessary compiler_wrapper PG.
# Disable it to reduce logfile clutter and obfuscation.
#
compwrap.compilers_to_wrap
configure.args --enable-shared \
--enable-install-static-library \
--disable-install-doc \
@@ -196,9 +201,16 @@ platform darwin {
}
}
# Tests don't fully pass on any platform, though the details are platform-
# dependent. We allow them for investigative purposes, along with a warning.
test.run yes
test.target check
pre-test {
ui_warn "Tests are not expected to fully pass."
}
livecheck.type regex
livecheck.url https://cache.ruby-lang.org/pub/ruby/${ruby_ver}/
livecheck.regex ruby-(3\\.2\\.\\d+)[quotemeta ${extract.suffix}]
lang/ruby32/files/patch-sources.diff
+20 -20
View File
@@ -1,5 +1,5 @@
--- .gdbinit.orig 2026-01-13 16:56:38.000000000 -0800
+++ .gdbinit 2026-01-15 14:59:06.000000000 -0800
--- .gdbinit.orig 2026-03-26 14:53:23.000000000 -0700
+++ .gdbinit 2026-03-26 20:28:33.000000000 -0700
@@ -1,4 +1,5 @@
-set startup-with-shell off
+# Move this to end, so failure on older gdbs doesn't blow the rest
@@ -14,8 +14,8 @@
+
+# Moved from beginning, since it fails on older gdbs
+set startup-with-shell off
--- ext/digest/md5/md5cc.h.orig 2026-01-13 16:56:38.000000000 -0800
+++ ext/digest/md5/md5cc.h 2026-01-15 14:59:06.000000000 -0800
--- ext/digest/md5/md5cc.h.orig 2026-03-26 14:53:23.000000000 -0700
+++ ext/digest/md5/md5cc.h 2026-03-26 20:28:33.000000000 -0700
@@ -17,3 +17,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(MD5
#undef MD5_Finish
#define MD5_Update rb_digest_MD5_update
@@ -28,8 +28,8 @@
+ */
+#undef MD5_Init
+#define MD5_Init CC_MD5_Init
--- ext/digest/sha1/sha1cc.h.orig 2026-01-13 16:56:38.000000000 -0800
+++ ext/digest/sha1/sha1cc.h 2026-01-15 14:59:06.000000000 -0800
--- ext/digest/sha1/sha1cc.h.orig 2026-03-26 14:53:23.000000000 -0700
+++ ext/digest/sha1/sha1cc.h 2026-03-26 20:28:33.000000000 -0700
@@ -12,3 +12,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(SHA
#undef SHA1_Finish
#define SHA1_Update rb_digest_SHA1_update
@@ -42,8 +42,8 @@
+ */
+#undef SHA1_Init
+#define SHA1_Init CC_SHA1_Init
--- ext/digest/sha2/sha2cc.h.orig 2026-01-13 16:56:38.000000000 -0800
+++ ext/digest/sha2/sha2cc.h 2026-01-15 14:59:06.000000000 -0800
--- ext/digest/sha2/sha2cc.h.orig 2026-03-26 14:53:23.000000000 -0700
+++ ext/digest/sha2/sha2cc.h 2026-03-26 20:28:33.000000000 -0700
@@ -1,6 +1,33 @@
#define COMMON_DIGEST_FOR_OPENSSL 1
#include <CommonCrypto/CommonDigest.h>
@@ -94,8 +94,8 @@
+#define SHA384_Init CC_SHA384_Init
+#undef SHA512_Init
+#define SHA512_Init CC_SHA512_Init
--- file.c.orig 2026-01-13 16:56:38.000000000 -0800
+++ file.c 2026-01-15 14:59:06.000000000 -0800
--- file.c.orig 2026-03-26 14:53:23.000000000 -0700
+++ file.c 2026-03-26 20:28:33.000000000 -0700
@@ -300,10 +300,30 @@ rb_CFString_class_initialize_before_fork
long len = sizeof(small_str) - 1;
@@ -147,8 +147,8 @@
CFMutableStringRef m = CFStringCreateMutableCopy(kCFAllocatorDefault, len, s);
long oldlen = RSTRING_LEN(str);
--- lib/bundler/gem_helper.rb.orig 2026-01-13 16:56:38.000000000 -0800
+++ lib/bundler/gem_helper.rb 2026-01-15 14:59:06.000000000 -0800
--- lib/bundler/gem_helper.rb.orig 2026-03-26 14:53:23.000000000 -0700
+++ lib/bundler/gem_helper.rb 2026-03-26 20:28:33.000000000 -0700
@@ -231,7 +231,7 @@ module Bundler
end
@@ -158,8 +158,8 @@
end
end
end
--- signal.c.orig 2026-01-13 16:56:38.000000000 -0800
+++ signal.c 2026-01-15 14:59:06.000000000 -0800
--- signal.c.orig 2026-03-26 14:53:23.000000000 -0700
+++ signal.c 2026-03-26 20:28:33.000000000 -0700
@@ -842,7 +842,8 @@ check_stack_overflow(int sig, const uint
const greg_t bp = mctx->gregs[REG_EBP];
# endif
@@ -170,8 +170,8 @@
# define MCTX_SS_REG(reg) __ss.__##reg
# else
# define MCTX_SS_REG(reg) ss.reg
--- thread_pthread.c.orig 2026-01-13 16:56:38.000000000 -0800
+++ thread_pthread.c 2026-01-15 14:59:06.000000000 -0800
--- thread_pthread.c.orig 2026-03-26 14:53:23.000000000 -0700
+++ thread_pthread.c 2026-03-26 20:28:33.000000000 -0700
@@ -42,6 +42,22 @@
#if defined __APPLE__
@@ -195,8 +195,8 @@
#endif
#if defined(HAVE_SYS_EVENTFD_H) && defined(HAVE_EVENTFD)
--- tool/transform_mjit_header.rb.orig 2026-01-13 16:56:38.000000000 -0800
+++ tool/transform_mjit_header.rb 2026-01-15 14:59:06.000000000 -0800
--- tool/transform_mjit_header.rb.orig 2026-03-26 14:53:23.000000000 -0700
+++ tool/transform_mjit_header.rb 2026-03-26 20:28:33.000000000 -0700
@@ -181,7 +181,9 @@ module MJITHeader
def self.conflicting_types?(code, cc, cflags)
with_code(code) do |path|
@@ -208,8 +208,8 @@
!$?.success? &&
(out.match?(/error: conflicting types for '[^']+'/) ||
out.match?(/error: redefinition of parameter '[^']+'/))
--- vm_dump.c.orig 2026-01-13 16:56:38.000000000 -0800
+++ vm_dump.c 2026-01-15 14:59:06.000000000 -0800
--- vm_dump.c.orig 2026-03-26 14:53:23.000000000 -0700
+++ vm_dump.c 2026-03-26 20:28:33.000000000 -0700
@@ -470,7 +470,8 @@ rb_vmdebug_thread_dump_state(VALUE self)
}