[前][次][番号順一覧][スレッド一覧]

ruby-changes:74171

From: nagachika <ko1@a...>
Date: Fri, 21 Oct 2022 15:02:32 +0900 (JST)
Subject: [ruby-changes:74171] 0146681df8 (ruby_3_1): merge revision(s) 6af7212004c0b98f09350b53a032f94f3a1e666c:

https://git.ruby-lang.org/ruby.git/commit/?id=0146681df8

From 0146681df8f064888038d51207cf520bdf74ac0d Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Fri, 21 Oct 2022 14:57:20 +0900
Subject: merge revision(s) 6af7212004c0b98f09350b53a032f94f3a1e666c:

	Make extensions under `Gem.extension_api_version` directory

	---
	 ext/extmk.rb | 3 ++-
	 1 file changed, 2 insertions(+), 1 deletion(-)
---
 ext/extmk.rb | 3 ++-
 version.h    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/extmk.rb b/ext/extmk.rb
index 5e13fc893e..1624ec9099 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -551,7 +551,8 @@ extend Module.new { https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L551
           "TARGET_TOPDIR = $(topdir)/.bundle\n" "#{$1}$(TARGET_TOPDIR)"
         }
         s.sub!(/^(TARGET_SO_DIR *= *)\$\(RUBYARCHDIR\)/) {
-          "TARGET_GEM_DIR = $(TARGET_TOPDIR)/extensions/$(gem_platform)/$(ruby_version)/#{@gemname}\n"\
+          "TARGET_GEM_DIR = $(TARGET_TOPDIR)/extensions/$(gem_platform)"\
+          "/$(ruby_version)#{$enable_shared ? '' : '-static'}/#{@gemname}\n"\
           "#{$1}$(TARGET_GEM_DIR)$(target_prefix)"
         }
       end
diff --git a/version.h b/version.h
index e54a2887bd..480c930279 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 138
+#define RUBY_PATCHLEVEL 139
 
 #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/

[前][次][番号順一覧][スレッド一覧]