Wed Apr 12 17:28:54 2023 UTC ()
Pullup ticket #6750 - requested by taca
lang/ruby32-base: build fix

Revisions pulled up:
- lang/ruby32-base/options.mk                                   1.2

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Tue Apr  4 12:20:30 UTC 2023

   Modified Files:
   	pkgsrc/lang/ruby32-base: options.mk

   Log Message:
   ruby32-base: default to yjit only on platforms supporting it.

   That would be x86_64, aarch64 and (possibly) aarch64be.

   OK'ed by taca@


(bsiegert)
diff -r1.1 -r1.1.2.1 pkgsrc/lang/ruby32-base/options.mk
cvs diff -r1.1 -r1.1.2.1 pkgsrc/lang/ruby32-base/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby32-base/options.mk 2023/01/21 13:51:23 1.1
+++ pkgsrc/lang/ruby32-base/options.mk 2023/04/12 17:28:54 1.1.2.1
@@ -1,18 +1,24 @@ @@ -1,18 +1,24 @@
1# $NetBSD: options.mk,v 1.1 2023/01/21 13:51:23 taca Exp $ 1# $NetBSD: options.mk,v 1.1.2.1 2023/04/12 17:28:54 bsiegert Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ruby 3PKG_OPTIONS_VAR= PKG_OPTIONS.ruby
4PKG_SUPPORTED_OPTIONS= ruby-build-ri-db ruby-yjit 4PKG_SUPPORTED_OPTIONS= ruby-build-ri-db ruby-yjit
5PKG_SUGGESTED_OPTIONS= ruby-build-ri-db ruby-yjit 5PKG_SUGGESTED_OPTIONS= ruby-build-ri-db
 6
 7.for a in "x86_64" "aarch64" "aarch64eb"
 8. if $a == ${MACHINE_ARCH}
 9PKG_SUGGESTED_OPTIONS+= ruby-yjit
 10. endif
 11.endfor
6 12
7.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
8 14
9.if ${PKG_OPTIONS:Mruby-yjit} 15.if ${PKG_OPTIONS:Mruby-yjit}
10CONFIGURE_ARGS+= --enable-yjit 16CONFIGURE_ARGS+= --enable-yjit
11RUST_REQ= 1.58.0 17RUST_REQ= 1.58.0
12.include "../../lang/rust/rust.mk" 18.include "../../lang/rust/rust.mk"
13.else 19.else
14CONFIGURE_ENV+= RUSTC=no 20CONFIGURE_ENV+= RUSTC=no
15.endif 21.endif
16 22
17.if ${PKG_OPTIONS:Mruby-build-ri-db} 23.if ${PKG_OPTIONS:Mruby-build-ri-db}
18RUBY_DYNAMIC_DIRS+= ${RUBY_SYSRIDIR} 24RUBY_DYNAMIC_DIRS+= ${RUBY_SYSRIDIR}