diff options
| author | jperkin <jperkin@pkgsrc.org> | 2022-05-05 10:15:17 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2022-05-05 10:15:17 +0000 |
| commit | 4c0d2b4adaefa082216fe5798a2136a3d1b8b104 (patch) | |
| tree | d2583d7a3229ed1b2848d7a3aaedcccaf606b87f /lang/ruby | |
| parent | dafb280420ccecc0bb8f39903a5e0c11eeeb9fce (diff) | |
| download | pkgsrc-4c0d2b4adaefa082216fe5798a2136a3d1b8b104.tar.gz | |
ruby: Handle ruby31 changing the config triple for arm64 macOS.
Diffstat (limited to 'lang/ruby')
| -rw-r--r-- | lang/ruby/rubyversion.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index e94acd51d03..a6a4f76b844 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -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. |