CVS commit: pkgsrc/lang/ruby

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May  5 10:15:17 UTC 2022

Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk

Log Message:
ruby: Handle ruby31 changing the config triple for arm64 macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 pkgsrc/lang/ruby/rubyversion.mk

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/rubyversion.mk
diff -u pkgsrc/lang/ruby/rubyversion.mk:1.250 pkgsrc/lang/ruby/rubyversion.mk:1.251
--- pkgsrc/lang/ruby/rubyversion.mk:1.250       Tue Apr 12 19:07:11 2022
+++ pkgsrc/lang/ruby/rubyversion.mk     Thu May  5 10:15:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.250 2022/04/12 19:07:11 nia Exp $
+# $NetBSD: rubyversion.mk,v 1.251 2022/05/05 10:15:17 jperkin Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -618,6 +618,12 @@ RUBY?=                     ${PREFIX}/bin/${RUBY_NAME}
 RAKE?=                 ${PREFIX}/bin/${RAKE_NAME}
 RDOC?=                 ${PREFIX}/bin/rdoc${RUBY_SUFFIX}
 
+# ruby31 helpfully changed the config triple...
+.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) && ${RUBY_VER} >= 31
+RUBY_ARCH?=    arm64-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
+RUBY_EXTARCH?= arm64-${LOWER_OPSYS}${APPEND_ELF}-${LOWER_OPSYS_VERSUFFIX}
+.endif
+
 RUBY_ARCH?=    ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
 
 # NetBSD does not append an OS version, so we have to do this OPSYS-specific.