ruby-changes:74112
From: nagachika <ko1@a...>
Date: Tue, 18 Oct 2022 21:52:10 +0900 (JST)
Subject: [ruby-changes:74112] 75539c2d1e (ruby_3_1): merge revision(s) 85a483169f8381bec08ff2c9a9fc66167fc8a84a:
https://git.ruby-lang.org/ruby.git/commit/?id=75539c2d1e From 75539c2d1ec42e938ebbcc70186a0c67c5b48753 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Tue, 18 Oct 2022 21:50:27 +0900 Subject: merge revision(s) 85a483169f8381bec08ff2c9a9fc66167fc8a84a: Use cross compiling settings as fake.rb for snapshots --- tool/make-snapshot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- tool/make-snapshot | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tool/make-snapshot b/tool/make-snapshot index b04af6a4d2..d2044970da 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -436,7 +436,7 @@ def package(vcs, rev, destdir, tmp = nil) https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L436 # use fallback file end clean.create("config.status", status) - clean.create("noarch-fake.rb") + clean.create("noarch-fake.rb", "require_relative 'cross'\n") FileUtils.mkpath(hdrdir = "#{extout}/include/ruby") File.binwrite("#{hdrdir}/config.h", "") FileUtils.mkpath(defaults = "#{extout}/rubygems/defaults") diff --git a/version.h b/version.h index 1dde5034df..46df323e54 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 109 +#define RUBY_PATCHLEVEL 110 #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/