CVS commit: [pkgsrc-2022Q1] pkgsrc/lang/ruby

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Apr  2 09:20:32 UTC 2022

Modified Files:
        pkgsrc/lang/ruby [pkgsrc-2022Q1]: rubyversion.mk

Log Message:
Pullup ticket #6611 - requested by nia
lang/ruby: NetBSD/arm build fix

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.245

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Sat Apr  2 07:51:46 UTC 2022

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

   Log Message:
   ruby: Do not append an ABI on NetBSD to the arch-specific extension
   directory. Failure seen in:

   http://victory.netbsd.org/pkgsrc/packages/reports/2022Q1/evbarm7-9.0/20220330.2134/ruby31-base-3.1.1/install.log


To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.244.2.1 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.244 pkgsrc/lang/ruby/rubyversion.mk:1.244.2.1
--- pkgsrc/lang/ruby/rubyversion.mk:1.244       Wed Feb 23 15:53:25 2022
+++ pkgsrc/lang/ruby/rubyversion.mk     Sat Apr  2 09:20:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.244 2022/02/23 15:53:25 jperkin Exp $
+# $NetBSD: rubyversion.mk,v 1.244.2.1 2022/04/02 09:20:32 bsiegert Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -622,7 +622,7 @@ RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_
 
 # NetBSD does not append an OS version, so we have to do this OPSYS-specific.
 .if ${OPSYS} == "NetBSD"
-RUBY_EXTARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
+RUBY_EXTARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
 .else
 RUBY_EXTARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}-${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
 .endif