ruby-changes:74166
From: nagachika <ko1@a...>
Date: Fri, 21 Oct 2022 15:02:29 +0900 (JST)
Subject: [ruby-changes:74166] c5a0856b4b (ruby_3_1): merge revision(s) ed8c21bbd5071b52d0d0612eadbdad8fe192e974:
https://git.ruby-lang.org/ruby.git/commit/?id=c5a0856b4b From c5a0856b4b34ecd2f5be070d454dbd3fc25d9529 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Fri, 21 Oct 2022 14:52:23 +0900 Subject: merge revision(s) ed8c21bbd5071b52d0d0612eadbdad8fe192e974: Ensure symlinks to bundled gem with exts have parent dir When configuring with `--disable-rpath` and `--static-linked-ext` (e.g. building for WASI), `extmk.rb` doesn't build exts under bundled gems, and `.bundle/gems/#{gemname}-#{ver}` are not created due to no call of `extmake`. b2491783986084770f6f97552f27b868622730cf starts creating symlink at `.bundle/gems/#{gemname}-#{ver}/lib`, but the parent dir is not created, so configuration aginst debug and rbs gems were failed. --- ext/extmk.rb | 1 + 1 file changed, 1 insertion(+) --- ext/extmk.rb | 1 + version.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/extmk.rb b/ext/extmk.rb index 764c25c838..e2196ebfb5 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -606,6 +606,7 @@ if @gemname https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L606 puts "using #{gemlib}" else begin + FileUtils.mkdir_p(File.dirname(gemlib)) File.symlink(relative_from(src_gemlib, ".."), gemlib) puts "linked #{gemlib}" rescue NotImplementedError, Errno::EPERM diff --git a/version.h b/version.h index d5f24e383b..564e086eaf 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 134 +#define RUBY_PATCHLEVEL 135 #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/