summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2022-04-02 09:20:32 +0000
committerbsiegert <bsiegert@pkgsrc.org>2022-04-02 09:20:32 +0000
commit62cf1e67aea28db4f7e5c51bb859af6153151188 (patch)
treefd76e6d12fb2bd20818a232ddcf96e170be4faff
parent253b2ef33877c7e510616d629d4f11759607d455 (diff)
downloadpkgsrc-62cf1e67aea28db4f7e5c51bb859af6153151188.tar.gz
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
-rw-r--r--lang/ruby/rubyversion.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index b1ff961845a..463bc23cefe 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -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_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFF
# 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