On 01/14 04:58, Jeremie Courreges-Anglas wrote:
> I was concerned by the JIT issues but with your fixes this looks ready
> to import now. ok jca@
Thanks for your review and testing. I've imported it and hooked it up
to the build. The next step is allowing building of ruby26-* packages
for ruby ports. Here's a diff for ruby.port.mk to allow that. I'll
commit this in a couple days unless i hear objections.
This includes a small fix for JRuby to fix MODRUBY_SITEDIR and
MODRUBY_LIBREV, which I should have made when upgrading JRuby to 9.2.
This doesn't currently affect anything in ports, since nothing that
uses either variable currently builds with JRuby.
After this goes in, I'll update ruby-module(5).
Thanks,
Jeremy
Index: ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.95
diff -u -p -r1.95 ruby.port.mk
--- ruby.port.mk 26 Oct 2018 16:12:24 -0000 1.95
+++ ruby.port.mk 14 Jan 2019 16:21:02 -0000
@@ -24,7 +24,7 @@ MODRUBY_HANDLE_FLAVORS ?= No
# If ruby.pork.mk should handle FLAVORs, define a separate FLAVOR
# for each ruby interpreter
. if !defined(FLAVORS)
-FLAVORS= ruby24 ruby25
+FLAVORS= ruby24 ruby25 ruby26
. if !${CONFIGURE_STYLE:L:Mext}
FLAVORS+= jruby
. endif
@@ -52,11 +52,12 @@ FLAVOR = ruby25
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
# on the FLAVOR.
-. for i in ruby24 ruby25 jruby
+. for i in ruby24 ruby25 ruby26 jruby
. if ${FLAVOR:M$i}
MODRUBY_REV = ${i:C/ruby([0-9])/\1./}
. if ${FLAVOR:N$i:Mruby24} || \
${FLAVOR:N$i:Mruby25} || \
+ ${FLAVOR:N$i:Mruby26} || \
${FLAVOR:N$i:Mjruby}
ERRORS += "Fatal: Conflicting flavors used: ${FLAVOR}"
. endif
@@ -86,9 +87,9 @@ MODRUBY_BIN_RSPEC = ${RUBY} -S rspec
MODRUBY_BIN_TESTRB = ${RUBY} -S testrb
MODRUBY_FLAVOR = jruby
MODRUBY_LIBDIR= ${LOCALBASE}/jruby/lib/ruby
-MODRUBY_LIBREV = 2.3.0
+MODRUBY_LIBREV = 2.5
MODRUBY_SITEARCHDIR = ${MODRUBY_SITEDIR}/java
-MODRUBY_SITEDIR = jruby/lib/ruby/site_ruby/${MODRUBY_LIBREV}
+MODRUBY_SITEDIR = jruby/lib/ruby/${MODRUBY_LIBREV}/site_ruby
RAKE= ${RUBY} -S rake
RSPEC= ${RUBY} -S spec
RUBY= ${LOCALBASE}/jruby/bin/jruby
