ruby-changes:74107
From: nagachika <ko1@a...>
Date: Tue, 18 Oct 2022 21:52:04 +0900 (JST)
Subject: [ruby-changes:74107] fbebe49365 (ruby_3_1): merge revision(s) a01271c1c46079cb6f7f32051f1253cf3d9bca6b:
https://git.ruby-lang.org/ruby.git/commit/?id=fbebe49365 From fbebe4936543af93a2e04893fe2f95cabaff342e Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Tue, 18 Oct 2022 21:44:27 +0900 Subject: merge revision(s) a01271c1c46079cb6f7f32051f1253cf3d9bca6b: BOOTSTRAPRUBY needs fake.rb when cross-compiling --- configure.ac | 1 + 1 file changed, 1 insertion(+) --- configure.ac | 1 + version.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 36691f6f76..efdd92698a 100644 --- a/configure.ac +++ b/configure.ac @@ -3326,6 +3326,7 @@ AS_IF([test x"$cross_compiling" = xyes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3326 RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' RUNRUBY='$(RUNRUBY_COMMAND)' XRUBY='$(MINIRUBY)' + BOOTSTRAPRUBY_COMMAND='$(BOOTSTRAPRUBY) -r./$(arch)-fake' TEST_RUNNABLE=no CROSS_COMPILING=yes AC_DEFINE(CROSS_COMPILING, 1) diff --git a/version.h b/version.h index f905ce416e..fa917168d5 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 104 +#define RUBY_PATCHLEVEL 105 #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/