<pre style='margin:0'>
tobypeterson pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/adca1dd40ff36f5903aef4c731a0a48d9f06f73c">https://github.com/macports/macports-ports/commit/adca1dd40ff36f5903aef4c731a0a48d9f06f73c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new adca1dd40ff ruby33: update to 3.3.7
</span>adca1dd40ff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit adca1dd40ff36f5903aef4c731a0a48d9f06f73c
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Thu Jan 23 14:21:37 2025 -0800
<span style='display:block; white-space:pre;color:#404040;'> ruby33: update to 3.3.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See:
</span><span style='display:block; white-space:pre;color:#404040;'> https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ruby 3.3 no longer builds with Xcode 10.1 clang 425 on 10.7, so this
</span><span style='display:block; white-space:pre;color:#404040;'> blacklists clangs < 500 (in addition to the preexisting blacklisting
</span><span style='display:block; white-space:pre;color:#404040;'> of clang 900).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also cleans up a couple of long-standing Portfile issues.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built successfully on OSX 10.4-10.5 ppc, 10.4-10.6 i386, 10.5-12.x
</span><span style='display:block; white-space:pre;color:#404040;'> x86_64, and 11.x-15.x arm64. Included all variants compatible with
</span><span style='display:block; white-space:pre;color:#404040;'> available dependencies on the respective platforms.
</span>---
lang/ruby33/Portfile | 25 ++++++++++++++-----------
lang/ruby33/files/patch-sources.diff | 36 ++++++++++++++++++------------------
2 files changed, 32 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby33/Portfile b/lang/ruby33/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b1ddde45730..9f35bc28981 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,11 +17,11 @@ legacysupport.newest_darwin_requires_legacy 14
</span> # This property should be preserved.
set ruby_ver 3.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set ruby_patch 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ruby_patch 7
</span> set ruby_ver_nodot [string map {. {}} ${ruby_ver}]
name ruby${ruby_ver_nodot}
version ${ruby_ver}.${ruby_patch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +42,9 @@ master_sites ruby:${ruby_ver}
</span> distname ruby-${version}
dist_subdir ruby${ruby_ver_nodot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b77ffe3a13d630664a1ba91e5298575a430666f8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22153657
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b1cd4784744213af706c973f705dd859e6688928 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9c37c3b12288c7aec20ca121ce76845be5bb5d77662a24919651aaf1d12c8628 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22163173
</span>
# Universal builds don't currently work, including via the approach used
# in ruby30.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ select.file ${filespath}/ruby${ruby_ver_nodot}
</span>
# patch-sources.diff: fixes for various issues.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from v3_3_6 vs. macports-3_3_6r1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v3_3_7 vs. macports-3_3_7.
</span> #
patchfiles-append patch-sources.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,6 +83,10 @@ patchfiles-append patch-sources.diff
</span> compiler.blacklist-append \
{ clang >= 900 < 901 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ruby3.3 no longer builds with Xcode clang 425 on 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append { clang < 500 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ensure that the correct dsymutil is used.
</span> if { [string match macports-clang-* ${configure.compiler}] } {
# clang-mp-14 => dsymutil-mp-14; fix POSTLINK
configure.env-append dsymutil=[string map {clang dsymutil} ${configure.cc}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,18 +161,17 @@ variant gmp description "use gmp" {
</span> }
variant jemalloc description "use jemalloc" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-jemalloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-jemalloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-jemalloc --with-jemalloc
</span> depends_lib-append port:jemalloc
}
variant yjit description "enable YJIT (requires rust)" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-yjit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-yjit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-yjit --enable-yjit
</span> depends_build-append port:rust
}
# yjit supports x86_64 or arm64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 19 && [info exists build_arch]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 19 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && [info exists build_arch]} {
</span> if {$build_arch in [list x86_64 arm64]} {
default_variants-append +yjit
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby33/files/patch-sources.diff b/lang/ruby33/files/patch-sources.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index eedef358985..59b9b330ba6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby33/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby33/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .gdbinit.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .gdbinit 2025-01-06 14:44:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .gdbinit.orig 2025-01-14 23:22:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .gdbinit 2025-01-20 13:54:57.000000000 -0800
</span> @@ -1,4 +1,5 @@
-set startup-with-shell off
+# Move this to end, so failure on older gdbs doesn't blow the rest
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +14,8 @@
</span> +
+# Moved from beginning, since it fails on older gdbs
+set startup-with-shell off
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/digest/md5/md5cc.h.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/md5/md5cc.h 2025-01-06 14:44:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/md5/md5cc.h.orig 2025-01-14 23:22:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/md5/md5cc.h 2025-01-20 13:54:57.000000000 -0800
</span> @@ -17,3 +17,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(MD5
#undef MD5_Finish
#define MD5_Update rb_digest_MD5_update
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +28,8 @@
</span> + */
+#undef MD5_Init
+#define MD5_Init CC_MD5_Init
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/digest/sha1/sha1cc.h.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha1/sha1cc.h 2025-01-06 14:44:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha1/sha1cc.h.orig 2025-01-14 23:22:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha1/sha1cc.h 2025-01-20 13:54:57.000000000 -0800
</span> @@ -12,3 +12,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(SHA
#undef SHA1_Finish
#define SHA1_Update rb_digest_SHA1_update
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,8 @@
</span> + */
+#undef SHA1_Init
+#define SHA1_Init CC_SHA1_Init
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/digest/sha2/sha2cc.h.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha2/sha2cc.h 2025-01-06 14:44:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha2/sha2cc.h.orig 2025-01-14 23:22:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha2/sha2cc.h 2025-01-20 13:54:57.000000000 -0800
</span> @@ -1,6 +1,33 @@
#define COMMON_DIGEST_FOR_OPENSSL 1
#include <CommonCrypto/CommonDigest.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,8 +94,8 @@
</span> +#define SHA384_Init CC_SHA384_Init
+#undef SHA512_Init
+#define SHA512_Init CC_SHA512_Init
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- file.c.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ file.c 2025-01-06 14:44:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- file.c.orig 2025-01-14 23:22:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ file.c 2025-01-20 13:54:57.000000000 -0800
</span> @@ -299,10 +299,30 @@ rb_CFString_class_initialize_before_fork
long len = sizeof(small_str) - 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,8 +147,8 @@
</span> CFMutableStringRef m = CFStringCreateMutableCopy(kCFAllocatorDefault, len, s);
long oldlen = RSTRING_LEN(str);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/bundler/gem_helper.rb.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/bundler/gem_helper.rb 2025-01-06 14:44:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/bundler/gem_helper.rb.orig 2025-01-14 23:22:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/bundler/gem_helper.rb 2025-01-20 13:54:57.000000000 -0800
</span> @@ -231,7 +231,7 @@ module Bundler
end
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,8 +158,8 @@
</span> end
end
end
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- signal.c.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ signal.c 2025-01-06 14:44:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2025-01-14 23:22:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2025-01-20 13:54:57.000000000 -0800
</span> @@ -803,7 +803,8 @@ check_stack_overflow(int sig, const uint
const greg_t bp = mctx->gregs[REG_EBP];
# endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,8 +170,8 @@
</span> # define MCTX_SS_REG(reg) __ss.__##reg
# else
# define MCTX_SS_REG(reg) ss.reg
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- thread_pthread.c.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ thread_pthread.c 2025-01-06 14:44:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- thread_pthread.c.orig 2025-01-14 23:22:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ thread_pthread.c 2025-01-20 13:54:57.000000000 -0800
</span> @@ -42,6 +42,22 @@
#if defined __APPLE__
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,8 +195,8 @@
</span> #endif
#if defined(HAVE_SYS_EVENTFD_H) && defined(HAVE_EVENTFD)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- vm_dump.c.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm_dump.c 2025-01-06 14:44:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_dump.c.orig 2025-01-14 23:22:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2025-01-20 13:54:57.000000000 -0800
</span> @@ -490,7 +490,8 @@ rb_vmdebug_thread_dump_state(FILE *errou
}
</pre><pre style='margin:0'>
</pre>