CVS commit: pkgsrc/lang/ruby40

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri May 15 16:56:19 UTC 2026

Modified Files:
        pkgsrc/lang/ruby40: Makefile distinfo
Added Files:
        pkgsrc/lang/ruby40/patches: patch-template_Makefile.in

Log Message:
ruby40: fix parallel build and dtrace-related build problem


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby40/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ruby40/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/lang/ruby40/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/ruby40/Makefile
diff -u pkgsrc/lang/ruby40/Makefile:1.2 pkgsrc/lang/ruby40/Makefile:1.3
--- pkgsrc/lang/ruby40/Makefile:1.2     Tue May  5 14:09:07 2026
+++ pkgsrc/lang/ruby40/Makefile Fri May 15 16:56:18 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2026/05/05 14:09:07 taca Exp $
+# $NetBSD: Makefile,v 1.3 2026/05/15 16:56:18 wiz Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION}
@@ -11,7 +11,6 @@ COMMENT=      Ruby ${RUBY_VERSION} release pa
 
 RUBY_VERSIONS_ACCEPTED=        40
 
-MAKE_JOBS_SAFE=                no
 USE_GCC_RUNTIME=       yes
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            pax yacc pkg-config

Index: pkgsrc/lang/ruby40/distinfo
diff -u pkgsrc/lang/ruby40/distinfo:1.5 pkgsrc/lang/ruby40/distinfo:1.6
--- pkgsrc/lang/ruby40/distinfo:1.5     Tue May  5 14:09:07 2026
+++ pkgsrc/lang/ruby40/distinfo Fri May 15 16:56:18 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2026/05/05 14:09:07 taca Exp $
+$NetBSD: distinfo,v 1.6 2026/05/15 16:56:18 wiz Exp $
 
 BLAKE2s (ruby-4.0.3.tar.xz) = 0d31978571c4c160cce72d1bab331681206800c6ec1fb61f63f9947c9d2186be
 SHA512 (ruby-4.0.3.tar.xz) = 5816fb264ce76df59f4bfe0cadceb45025fada2e61f2c14024d6b03f63d304820cddf94afcf82a4951fd12f3b0d9148683f856f3f2245d56042fc8407b6cbff5
@@ -17,6 +17,7 @@ SHA1 (patch-lib_rubygems_install__update
 SHA1 (patch-lib_rubygems_installer.rb) = 68a43121b4faab060afa4e352e1603f9d6630a47
 SHA1 (patch-lib_rubygems_platform.rb) = 6bd2e1c5c3064f9d694508169a5bf0a594d7bbef
 SHA1 (patch-lib_rubygems_specification.rb) = f543cab6b56fec0f7195d4eabddedc080c18688c
+SHA1 (patch-template_Makefile.in) = 1159c28d70a5e8ab8e4b1aabb7059c8f2e4e4839
 SHA1 (patch-test_rubygems_test__gem.rb) = 32f7c7d7f8a024c045d78c2bce93944fc3113d04
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca
 SHA1 (patch-tool_ifchange) = 1803bb6a1836e232dcabcf38f11c9881dbf726ea

Added files:

Index: pkgsrc/lang/ruby40/patches/patch-template_Makefile.in
diff -u /dev/null pkgsrc/lang/ruby40/patches/patch-template_Makefile.in:1.3
--- /dev/null   Fri May 15 16:56:19 2026
+++ pkgsrc/lang/ruby40/patches/patch-template_Makefile.in       Fri May 15 16:56:19 2026
@@ -0,0 +1,28 @@
+$NetBSD: patch-template_Makefile.in,v 1.3 2026/05/15 16:56:19 wiz Exp $
+
+Try fixing make parallelism/submake problems.
+
+1. make sure no stale probes.o is there when the probes.o is rebuilt
+2. ruby-glommed and probes.stamp depend on the same files, make sure
+   they don't trigger the same objects twice.
+
+--- template/Makefile.in.orig  2026-05-07 20:25:14.644318083 +0000
++++ template/Makefile.in
+@@ -523,7 +523,7 @@ probes.stamp: $(DTRACE_REBUILD_OBJS)
+ 
+ probes.stamp: $(DTRACE_REBUILD_OBJS)
+       $(Q) if test -f $@ -o -f probes.$(OBJEXT); then \
+-        $(RM) $(DTRACE_REBUILD_OBJS) $@; \
++        $(RM) $(DTRACE_REBUILD_OBJS) $@ probes.$(OBJEXT); \
+         $(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:
+ 
+ # DTrace static library hacks described here:
+ # https://marc.info/?l=opensolaris-dtrace-discuss&m=114761203110734&w=4
+-ruby-glommed.$(OBJEXT):
++ruby-glommed.$(OBJEXT): probes.$(OBJEXT)
+       @$(ECHO) generating a glommed object with DTrace probes for static library
+       $(Q) $(LD) -r -o $@ $(OBJS)
+