CVS commit: pkgsrc/lang/ruby34

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Sep 22 09:29:37 UTC 2026

Modified Files:
        pkgsrc/lang/ruby34: distinfo
        pkgsrc/lang/ruby34/patches: patch-template_Makefile.in

Log Message:
lang/ruby34: Fix ruby-rjit option

Fix build problem with ruby-rjit PKG_OPTIONS provided by PR pkg/60763.

No PKGREVISION bump since it is simply build problem.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/ruby34/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ruby34/patches/patch-template_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby34/distinfo
diff -u pkgsrc/lang/ruby34/distinfo:1.18 pkgsrc/lang/ruby34/distinfo:1.19
--- pkgsrc/lang/ruby34/distinfo:1.18    Wed Sep 16 15:00:10 2026
+++ pkgsrc/lang/ruby34/distinfo Tue Sep 22 09:29:37 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2026/09/16 15:00:10 taca Exp $
+$NetBSD: distinfo,v 1.19 2026/09/22 09:29:37 taca Exp $
 
 BLAKE2s (ruby-3.4.10.tar.xz) = f572159895927752a9dc04403c0ba186008aa8e3cf3c340eddb441444c48ac71
 SHA512 (ruby-3.4.10.tar.xz) = c28d59946c0a1b8e4385a772e0651c6f4154c18ab8a2a62289c3213eb4fe937cec0942e0076cda429576e58ad277b18f4b5611e644d15b122c1cd96baf10f284
@@ -19,7 +19,7 @@ SHA1 (patch-lib_rubygems_install__update
 SHA1 (patch-lib_rubygems_installer.rb) = 4ef74b4f79837a929e81bcd0e7eba9061a442304
 SHA1 (patch-lib_rubygems_platform.rb) = bde36a8fc1ba2fbf4d6fb8829bc116fb4d09b404
 SHA1 (patch-lib_rubygems_specification.rb) = a3154185ef89fb33e699dd54b19a8e274f3275e0
-SHA1 (patch-template_Makefile.in) = 3cf5d612ef725dc64d6a90d377b191a29ebfdf17
+SHA1 (patch-template_Makefile.in) = 843b42816939f25321f83eabfc5a35bd598428e7
 SHA1 (patch-test_rubygems_test__gem.rb) = 32f7c7d7f8a024c045d78c2bce93944fc3113d04
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca
 SHA1 (patch-tool_ifchange) = 1803bb6a1836e232dcabcf38f11c9881dbf726ea

Index: pkgsrc/lang/ruby34/patches/patch-template_Makefile.in
diff -u pkgsrc/lang/ruby34/patches/patch-template_Makefile.in:1.1 pkgsrc/lang/ruby34/patches/patch-template_Makefile.in:1.2
--- pkgsrc/lang/ruby34/patches/patch-template_Makefile.in:1.1   Sun Sep  6 15:13:58 2026
+++ pkgsrc/lang/ruby34/patches/patch-template_Makefile.in       Tue Sep 22 09:29:37 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-template_Makefile.in,v 1.1 2026/09/06 15:13:58 kikadf Exp $
+$NetBSD: patch-template_Makefile.in,v 1.2 2026/09/22 09:29:37 taca Exp $
 
 Try fixing make parallelism/submake problems.
 
@@ -8,9 +8,27 @@ Try fixing make parallelism/submake prob
 
 https://bugs.ruby-lang.org/issues/22059
 
---- template/Makefile.in.orig  2026-05-07 20:25:14.644318083 +0000
+rjit_c.c has a DTrace hook (RUBY_DTRACE_CMETHOD_RETURN_HOOK) but its
+object was not in DTRACE_DEPENDENT_OBJS, so on a DTRACE_REBUILD=yes
+system such as NetBSD "dtrace -G" never processed it and linking
+miniruby failed with --enable-rjit:
+
+  ld: rjit_c.o: relocation R_X86_64_PLT32 against absolute symbol
+  `__dtraceenabled_ruby___cmethod__return' in section `.text' is disallowed
+
+Same fix as upstream made for yjit.o (https://bugs.ruby-lang.org/issues/18480).
+
+--- template/Makefile.in.orig  2026-06-30 10:54:35.000000000 +0000
 +++ template/Makefile.in
-@@ -523,7 +523,7 @@ probes.stamp: $(DTRACE_REBUILD_OBJS)
+@@ -203,6 +203,7 @@ DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) 
+                       string.$(OBJEXT) \
+                       symbol.$(OBJEXT) \
+                       vm.$(OBJEXT) \
++                      rjit_c.$(OBJEXT) \
+                       $(YJIT_OBJ)
+ 
+ THREAD_MODEL  = @THREAD_MODEL@
+@@ -513,7 +514,7 @@ _PREFIXED_SYMBOL = TOKEN_PASTE($(SYMBOL_
  
  probes.stamp: $(DTRACE_REBUILD_OBJS)
        $(Q) if test -f $@ -o -f probes.$(OBJEXT); then \
@@ -19,7 +37,7 @@ https://bugs.ruby-lang.org/issues/22059
          $(ECHO0) "rebuilding objects which were modified by \"dtrace -G\""; \
          $(MAKE) $(DTRACE_REBUILD_OBJS); \
        fi
-@@ -537,7 +537,7 @@ probes.$(OBJEXT): $(srcdir)/probes.d $(DTRACE_REBUILD:
+@@ -527,7 +528,7 @@ probes.$(OBJEXT): $(srcdir)/probes.d $(D
  
  # DTrace static library hacks described here:
  # https://marc.info/?l=opensolaris-dtrace-discuss&m=114761203110734&w=4