ruby-changes:74110
From: nagachika <ko1@a...>
Date: Tue, 18 Oct 2022 21:52:07 +0900 (JST)
Subject: [ruby-changes:74110] 0bdf9c4e01 (ruby_3_1): merge revision(s) 21a5da3c4c803987c48bc9ca588948c50715631a:
https://git.ruby-lang.org/ruby.git/commit/?id=0bdf9c4e01 From 0bdf9c4e01345867159aa042b2540be710f8ec5e Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Tue, 18 Oct 2022 21:40:12 +0900 Subject: merge revision(s) 21a5da3c4c803987c48bc9ca588948c50715631a: Check if MSys shell can run a command with a drive letter --- configure.ac | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- configure.ac | 10 ++++++++-- version.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 90d24f0a07..3d18776ed7 100644 --- a/configure.ac +++ b/configure.ac @@ -62,13 +62,19 @@ AC_ARG_WITH(baseruby, https://github.com/ruby/ruby/blob/trunk/configure.ac#L62 AC_PATH_PROG([BASERUBY], [ruby], [false]) ]) AS_IF([test "$HAVE_BASERUBY" != no -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42 if RUBY_VERSION > "2.2"' 2>/dev/null`" = 42], [ + AS_CASE(["$build_os"], [mingw*], [ + # Can MSys shell run a command with a drive letter? + RUBYOPT=- `cygpath -ma "$BASERUBY"` --disable=gems -e exit 2>/dev/null || HAVE_BASERUBY=no + ]) 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 ], [ - BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false" HAVE_BASERUBY=no ]) +AS_IF([test "$HAVE_BASERUBY" = no], [ + BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false" +]) AC_SUBST(BASERUBY) AC_SUBST(HAVE_BASERUBY) @@ -3329,7 +3335,7 @@ AS_IF([test x"$cross_compiling" = xyes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3335 RUNRUBY_COMMAND='$(MINIRUBY) $(tooldir)/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)' RUNRUBY='$(RUNRUBY_COMMAND) --' XRUBY='$(RUNRUBY)' - AS_CASE(["$HAVE_BASERUBY:$build_os"], [no:*|*:mingw*], [BOOTSTRAPRUBY='$(MINIRUBY)']) + AS_CASE(["$HAVE_BASERUBY"], [no], [BOOTSTRAPRUBY='$(MINIRUBY)']) TEST_RUNNABLE=yes CROSS_COMPILING=no ]) diff --git a/version.h b/version.h index b739d8888d..15c552d06e 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 101 +#define RUBY_PATCHLEVEL 102 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/