Sat Apr 2 07:51:46 2022 UTC ()
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


(nia)
diff -r1.244 -r1.245 pkgsrc/lang/ruby/rubyversion.mk
cvs diff -r1.244 -r1.245 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2022/02/23 15:53:25 1.244
+++ pkgsrc/lang/ruby/rubyversion.mk 2022/04/02 07:51:46 1.245
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.244 2022/02/23 15:53:25 jperkin Exp $ 1# $NetBSD: rubyversion.mk,v 1.245 2022/04/02 07:51:46 nia Exp $
2# 2#
3 3
4# This file determines which Ruby version is used as a dependency for 4# This file determines which Ruby version is used as a dependency for
5# a package. 5# a package.
6# 6#
7# 7#
8# === User-settable variables === 8# === User-settable variables ===
9# 9#
10# RUBY_VERSION_DEFAULT 10# RUBY_VERSION_DEFAULT
11# The preferered Ruby version to use. 11# The preferered Ruby version to use.
12# 12#
13# Possible values: 26 27 30 31 13# Possible values: 26 27 30 31
14# Default: 27 14# Default: 27
@@ -612,27 +612,27 @@ RUBY_SUFFIX= @@ -612,27 +612,27 @@ RUBY_SUFFIX=
612RUBY_NAME= ruby 612RUBY_NAME= ruby
613.endif 613.endif
614 614
615RUBY_BUILD_DOCUMENT?= Yes 615RUBY_BUILD_DOCUMENT?= Yes
616 616
617RUBY?= ${PREFIX}/bin/${RUBY_NAME} 617RUBY?= ${PREFIX}/bin/${RUBY_NAME}
618RAKE?= ${PREFIX}/bin/${RAKE_NAME} 618RAKE?= ${PREFIX}/bin/${RAKE_NAME}
619RDOC?= ${PREFIX}/bin/rdoc${RUBY_SUFFIX} 619RDOC?= ${PREFIX}/bin/rdoc${RUBY_SUFFIX}
620 620
621RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI} 621RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
622 622
623# NetBSD does not append an OS version, so we have to do this OPSYS-specific. 623# NetBSD does not append an OS version, so we have to do this OPSYS-specific.
624.if ${OPSYS} == "NetBSD" 624.if ${OPSYS} == "NetBSD"
625RUBY_EXTARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI} 625RUBY_EXTARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
626.else 626.else
627RUBY_EXTARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}-${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI} 627RUBY_EXTARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}-${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
628.endif 628.endif
629 629
630RUBY_MAJOR_MINOR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} 630RUBY_MAJOR_MINOR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
631 631
632# 632#
633# Ruby shared and static library version handling. 633# Ruby shared and static library version handling.
634# 634#
635RUBY_SHLIBVER?= ${RUBY_VERSION} 635RUBY_SHLIBVER?= ${RUBY_VERSION}
636 636
637_RUBY_SHLIB_MAJOR:= ${RUBY_SHLIBVER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1\2/} 637_RUBY_SHLIB_MAJOR:= ${RUBY_SHLIBVER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1\2/}
638_RUBY_SHLIB_MINOR:= ${RUBY_SHLIBVER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} 638_RUBY_SHLIB_MINOR:= ${RUBY_SHLIBVER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}