From 93d1a2e94cf27744b725dd4a90e3044aaffc3c4d Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 21 Oct 2022 14:51:24 +0900 Subject: merge revision(s) dcbb94d5b9b4a7d0bfde5ba9a5da1ada643a31b7: Move timestamps directory for bundled gems --- ext/extmk.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- ext/extmk.rb | 5 ++++- version.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ext/extmk.rb b/ext/extmk.rb index ea4b1795d4..764c25c838 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -540,8 +540,11 @@ extend Module.new { return super unless @gemname super(*args) do |conf| conf.find do |s| + s.sub!(/^(TIMESTAMP_DIR *= *)\$\(extout\)/) { + "TARGET_TOPDIR = $(topdir)/.bundle\n" "#{$1}$(TARGET_TOPDIR)" + } s.sub!(/^(TARGET_SO_DIR *= *)\$\(RUBYARCHDIR\)/) { - "TARGET_GEM_DIR = $(topdir)/.bundle/extensions/$(gem_platform)/$(ruby_version)/#{@gemname}\n"\ + "TARGET_GEM_DIR = $(TARGET_TOPDIR)/extensions/$(gem_platform)/$(ruby_version)/#{@gemname}\n"\ "#{$1}$(TARGET_GEM_DIR)$(target_prefix)" } end diff --git a/version.h b/version.h index 841edfa421..d5f24e383b 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ # 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 133 +#define RUBY_PATCHLEVEL 134 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3