[前][次][番号順一覧][スレッド一覧]

ruby-changes:61409

From: Jeremy <ko1@a...>
Date: Thu, 28 May 2020 23:57:53 +0900 (JST)
Subject: [ruby-changes:61409] 9a3371be8f (master): Check that BASERUBY is at least Ruby 2.2 in configure

https://git.ruby-lang.org/ruby.git/commit/?id=9a3371be8f

From 9a3371be8f5274d1dca64b93c7b9a379e32ea2f5 Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@j...>
Date: Tue, 3 Mar 2020 12:24:02 -0800
Subject: Check that BASERUBY is at least Ruby 2.2 in configure

BASERUBY needs to be at least Ruby 2.2 since
46acd0075d80c2f886498f089fde1e9d795d50c4.

I think it's better to explicitly fail early as soon as BASERUBY
is used in this case, versus trying to debug later failures.

This modifies things to check both implicitly use of ruby in the
PATH as BASERUBY, and explicitly specified older versions of ruby
when using --with-baseruby.

Fixes [Bug #16668]

diff --git a/configure.ac b/configure.ac
index ac082a8..71e71dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_ARG_WITH(baseruby, https://github.com/ruby/ruby/blob/trunk/configure.ac#L34
 	[
 		AC_PATH_PROG([BASERUBY], [ruby], [false])
 	])
-AS_IF([test "$HAVE_BASERUBY" = yes -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42], [
+AS_IF([test "$HAVE_BASERUBY" != no -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42 if RUBY_VERSION > "2.2"' 2>/dev/null`" = 42], [
     BASERUBY="$BASERUBY --disable=gems"
     BASERUBY_VERSION=`$BASERUBY -v`
     $BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub >&AS_MESSAGE_FD
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]