pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ruby ruby: Handle ruby31 changing the config trip...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8e88af321233
branches: trunk
changeset: 378744:8e88af321233
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Thu May 05 10:15:17 2022 +0000
description:
ruby: Handle ruby31 changing the config triple for arm64 macOS.
diffstat:
lang/ruby/rubyversion.mk | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diffs (22 lines):
diff -r f2fbadfc62ff -r 8e88af321233 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Thu May 05 09:38:15 2022 +0000
+++ b/lang/ruby/rubyversion.mk Thu May 05 10:15:17 2022 +0000
@@ -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 @@
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.
Home |
Main Index |
Thread Index |
Old Index