CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat May  7 09:36:16 UTC 2022

Modified Files:
        pkgsrc/lang/ruby: platform.mk
        pkgsrc/lang/ruby31-base: Makefile distinfo
Added Files:
        pkgsrc/lang/ruby31-base/patches: patch-template_Makefile.in

Log Message:
lang/ruby31-base: better fix than privious one

Instead of disabling DTrace, process object file yjit.o with "dtrace -G".

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/ruby/platform.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ruby31-base/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ruby31-base/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ruby31-base/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/ruby/platform.mk
diff -u pkgsrc/lang/ruby/platform.mk:1.11 pkgsrc/lang/ruby/platform.mk:1.12
--- pkgsrc/lang/ruby/platform.mk:1.11   Wed May  4 16:44:53 2022
+++ pkgsrc/lang/ruby/platform.mk        Sat May  7 09:36:16 2022
@@ -1,4 +1,4 @@
-# $NetBSD: platform.mk,v 1.11 2022/05/04 16:44:53 taca Exp $
+# $NetBSD: platform.mk,v 1.12 2022/05/07 09:36:16 taca Exp $
 #
 
 #
@@ -117,19 +117,10 @@ CONFIGURE_ARGS+=  --disable-dtrace
 #
 # NetBSD
 #
-# Ruby 3.1 seems to have problem "dtrace -G" on NetBSD 8.
-#
-.if ${RUBY_VER} == 31 && ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M8*)
-CONFIGURE_ARGS+=       --disable-dtrace
-.endif
-
-#
-# NetBSD
-#
 # NetBSD 8.0 has problem with using static_assert macro.
 # This is very ad hoc fix to prevent it.
 #
-.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M8.0*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} == 080000
 CFLAGS+=       -DRB_AVOID_STATIC_ASSERT
 .endif
 

Index: pkgsrc/lang/ruby31-base/Makefile
diff -u pkgsrc/lang/ruby31-base/Makefile:1.4 pkgsrc/lang/ruby31-base/Makefile:1.5
--- pkgsrc/lang/ruby31-base/Makefile:1.4        Wed May  4 15:49:51 2022
+++ pkgsrc/lang/ruby31-base/Makefile    Sat May  7 09:36:16 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2022/05/04 15:49:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/07 09:36:16 taca Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/lang/ruby31-base/distinfo
diff -u pkgsrc/lang/ruby31-base/distinfo:1.6 pkgsrc/lang/ruby31-base/distinfo:1.7
--- pkgsrc/lang/ruby31-base/distinfo:1.6        Thu May  5 10:25:05 2022
+++ pkgsrc/lang/ruby31-base/distinfo    Sat May  7 09:36:16 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2022/05/05 10:25:05 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2022/05/07 09:36:16 taca Exp $
 
 BLAKE2s (ruby-3.1.2.tar.xz) = 5384cfebbd466de36f68f554be2c045363e6c074d90a94a4c035ecaadf3c878b
 SHA512 (ruby-3.1.2.tar.xz) = 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21
@@ -16,6 +16,7 @@ SHA1 (patch-lib_rubygems_dependency__ins
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3
 SHA1 (patch-lib_rubygems_installer.rb) = 03fcd57d4e7ea03cf2ffc3d219fd489e30361014
 SHA1 (patch-lib_rubygems_platform.rb) = 7ef0d86c2d84b942db726d293a319d7ea54e56c8
+SHA1 (patch-template_Makefile.in) = a4b94293de165e87021b79a0a7f683ba76e168d9
 SHA1 (patch-test_rubygems_test__gem.rb) = e624da5b9c49f9409160a7b0fdd2efad17986cab
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca
 SHA1 (patch-tool_ifchange) = 1814cd41f0b0a93b181799cb117bd1f57068cf33

Added files:

Index: pkgsrc/lang/ruby31-base/patches/patch-template_Makefile.in
diff -u /dev/null pkgsrc/lang/ruby31-base/patches/patch-template_Makefile.in:1.1
--- /dev/null   Sat May  7 09:36:16 2022
+++ pkgsrc/lang/ruby31-base/patches/patch-template_Makefile.in  Sat May  7 09:36:16 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-template_Makefile.in,v 1.1 2022/05/07 09:36:16 taca Exp $
+
+Add yjit.o to DTRACE_DEPENDENT_OBJS.
+
+--- template/Makefile.in.orig  2022-04-12 11:11:15.000000000 +0000
++++ template/Makefile.in
+@@ -193,7 +193,8 @@ DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) 
+                       parse.$(OBJEXT) \
+                       string.$(OBJEXT) \
+                       symbol.$(OBJEXT) \
+-                      vm.$(OBJEXT)
++                      vm.$(OBJEXT) \
++                      yjit.$(OBJEXT)
+ 
+ THREAD_MODEL  = @THREAD_MODEL@
+