<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/66ccc5251f9c535d253b9beb1109261eace51721">https://github.com/macports/macports-ports/commit/66ccc5251f9c535d253b9beb1109261eace51721</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 66ccc5251f9 ruby30: Fix build with Xcode 16.
</span>66ccc5251f9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 66ccc5251f9c535d253b9beb1109261eace51721
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Tue Sep 24 11:13:14 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> ruby30: Fix build with Xcode 16.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This backports an upstream fix that was already included in ruby3.1+.
</span><span style='display:block; white-space:pre;color:#404040;'> Although it's unlikely that this changes the content of successful
</span><span style='display:block; white-space:pre;color:#404040;'> builds, we revbump anyway out of conservatism.
</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 with default variants on OSX 10.4-10.5 ppc,
</span><span style='display:block; white-space:pre;color:#404040;'> 10.4-10.6 i386, 10.5-12.x x86_64, and 11.x-15.x arm64. Also built
</span><span style='display:block; white-space:pre;color:#404040;'> successfully with all -universal-jemalloc variants on 10.4-10.5. Also
</span><span style='display:block; white-space:pre;color:#404040;'> built successfully with all variants on all 10.6+ cases.
</span><span style='display:block; white-space:pre;color:#404040;'> Tests not run due to test framework issues.
</span>---
lang/ruby30/Portfile | 4 ++--
lang/ruby30/files/patch-generated.diff | 2 +-
lang/ruby30/files/patch-sources.diff | 40 +++++++++++++++++++++++-----------
3 files changed, 30 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby30/Portfile b/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42d605e2ac0..63a04885654 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name ruby30
version 3.0.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@ select.file ${filespath}/ruby30
</span> # patch-sources.diff: fixes for various issues.
# This includes the 'gem' versioning fix formerly handled via reinplace.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from v3_0_7 vs. macports-3_0_7.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v3_0_7 vs. macports-3_0_7r2.
</span> #
patchfiles-append patch-sources.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby30/files/patch-generated.diff b/lang/ruby30/files/patch-generated.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 881ff007b1c..320b29ce3d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby30/files/patch-generated.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby30/files/patch-generated.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> --- configure.orig 2024-04-23 03:23:28.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2024-04-25 17:40:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-09-23 19:38:03.000000000 -0700
</span> @@ -9272,6 +9272,8 @@ case "$target_archs" in #(
ARCH_FLAG=-m64 ;; #(
i[3-6]86) :
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby30/files/patch-sources.diff b/lang/ruby30/files/patch-sources.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0580dadbcd8..30ca8b83db7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby30/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby30/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> --- .gdbinit.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .gdbinit 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .gdbinit 2024-09-23 19:38:02.000000000 -0700
</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;'>@@ -15,7 +15,7 @@
</span> +# Moved from beginning, since it fails on older gdbs
+set startup-with-shell off
--- configure.ac.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-09-23 19:38:02.000000000 -0700
</span> @@ -2441,6 +2441,15 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
[arm64-darwin*], [
rb_cv_coroutine=arm64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@
</span> AS_CASE(["$ac_cv_sizeof_voidp"],
[8], [ rb_cv_coroutine=amd64 ],
--- dln.c.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dln.c 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dln.c 2024-09-23 19:38:02.000000000 -0700
</span> @@ -1350,8 +1350,7 @@ dln_load(const char *file)
if (dln_incompatible_library_p(handle)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@
</span> rb_fatal("%s - %s", incompatible, file);
# else
--- error.c.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ error.c 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ error.c 2024-09-23 19:38:02.000000000 -0700
</span> @@ -649,7 +649,7 @@ preface_dump(FILE *out)
"-- Crash Report log information "
"--------------------------------------------\n"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,8 +64,22 @@
</span> "CrashReporter or "
# endif
"DiagnosticReports directory in bug reports.\n"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/bigdecimal/bigdecimal.c.orig 2024-04-23 03:23:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/bigdecimal/bigdecimal.c 2024-09-23 19:38:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,7 +65,11 @@ static ID id_eq;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static ID id_half;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* MACRO's to guard objects from GC by keeping them in stack */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef RBIMPL_ATTR_MAYBE_UNUSED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ENTER(n) RBIMPL_ATTR_MAYBE_UNUSED() volatile VALUE vStack[n];int iStack=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ENTER(n) volatile VALUE RB_UNUSED_VAR(vStack[n]);int iStack=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PUSH(x) (vStack[iStack++] = (VALUE)(x))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SAVE(p) PUSH((p)->obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GUARD_OBJ(p,y) ((p)=(y), SAVE(p))
</span> --- file.c.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ file.c 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ file.c 2024-09-23 19:38:02.000000000 -0700
</span> @@ -152,6 +152,23 @@ int flock(int, int);
# include <stdlib.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +115,7 @@
</span> returning ENOTDIR in that case.
glibc realpath(3) can also return ENOENT for paths that exist,
--- io.c.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ io.c 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ io.c 2024-09-23 19:38:02.000000000 -0700
</span> @@ -114,6 +114,15 @@
# include <copyfile.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +133,7 @@
</span> #include "ccan/list/list.h"
#include "dln.h"
--- lib/bundler/gem_helper.rb.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/bundler/gem_helper.rb 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/bundler/gem_helper.rb 2024-09-23 19:38:02.000000000 -0700
</span> @@ -232,7 +232,7 @@ module Bundler
end
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +144,7 @@
</span> end
end
--- random.c.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ random.c 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ random.c 2024-09-23 19:38:02.000000000 -0700
</span> @@ -474,7 +474,16 @@ fill_random_bytes_urandom(void *seed, si
#if 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,7 +164,7 @@
</span> static int
fill_random_bytes_syscall(void *seed, size_t size, int unused)
--- signal.c.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ signal.c 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2024-09-23 19:38:02.000000000 -0700
</span> @@ -841,7 +841,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;'>@@ -162,7 +176,7 @@
</span> # else
# define MCTX_SS_REG(reg) ss.reg
--- template/Makefile.in.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ template/Makefile.in 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ template/Makefile.in 2024-09-23 19:38:02.000000000 -0700
</span> @@ -214,7 +214,7 @@ AR = @AR@
ARFLAGS = @ARFLAGS@$(empty)
RANLIB = @RANLIB@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,7 +187,7 @@
</span> OBJDUMP = @OBJDUMP@
OBJCOPY = @OBJCOPY@
--- tool/m4/ruby_default_arch.m4.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tool/m4/ruby_default_arch.m4 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tool/m4/ruby_default_arch.m4 2024-09-23 19:38:02.000000000 -0700
</span> @@ -4,6 +4,7 @@ AC_MSG_CHECKING([arch option])
AS_CASE([$1],
[*64], [ARCH_FLAG=-m64],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,7 +197,7 @@
</span> )
AC_MSG_RESULT([$ARCH_FLAG])
--- tool/transform_mjit_header.rb.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tool/transform_mjit_header.rb 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tool/transform_mjit_header.rb 2024-09-23 19:38:02.000000000 -0700
</span> @@ -184,7 +184,9 @@ module MJITHeader
def self.conflicting_types?(code, cc, cflags)
with_code(code) do |path|
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,7 +210,7 @@
</span> (out.match?(/error: conflicting types for '[^']+'/) ||
out.match?(/error: redefinition of parameter '[^']+'/))
--- vm_dump.c.orig 2024-04-23 03:23:26.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm_dump.c 2024-04-25 17:40:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2024-09-23 19:38:02.000000000 -0700
</span> @@ -462,7 +462,8 @@ rb_vmdebug_thread_dump_state(VALUE self)
}
</pre><pre style='margin:0'>
</pre>