ruby-changes:74021
From: nagachika <ko1@a...>
Date: Sun, 16 Oct 2022 18:40:46 +0900 (JST)
Subject: [ruby-changes:74021] ed960c6750 (ruby_3_1): merge revision(s) d7afaf21f2edfac8a606891868a3c4a7025267bd:
https://git.ruby-lang.org/ruby.git/commit/?id=ed960c6750 From ed960c6750d21b4c473044d9516e3a9eb2d335d0 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sun, 16 Oct 2022 16:31:37 +0900 Subject: merge revision(s) d7afaf21f2edfac8a606891868a3c4a7025267bd: Move the target directory of bundled gems like as rubygems --- ext/extmk.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- ext/extmk.rb | 6 +++++- version.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ext/extmk.rb b/ext/extmk.rb index 1ba0db8285..ea4b1795d4 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -2,6 +2,9 @@ https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L2 # -*- mode: ruby; coding: us-ascii -*- # frozen_string_literal: false +module Gem; end # only needs Gem::Platform +require 'rubygems/platform' + # :stopdoc: $extension = nil $extstatic = nil @@ -538,11 +541,12 @@ extend Module.new { https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L541 super(*args) do |conf| conf.find do |s| s.sub!(/^(TARGET_SO_DIR *= *)\$\(RUBYARCHDIR\)/) { - "TARGET_GEM_DIR = $(extout)/gems/$(arch)/#{@gemname}\n"\ + "TARGET_GEM_DIR = $(topdir)/.bundle/extensions/$(gem_platform)/$(ruby_version)/#{@gemname}\n"\ "#{$1}$(TARGET_GEM_DIR)$(target_prefix)" } end conf.any? {|s| /^TARGET *= *\S/ =~ s} and conf << %{ +gem_platform = #{Gem::Platform.local} # default target all: diff --git a/version.h b/version.h index be55756c6c..90ea886f14 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 92 +#define RUBY_PATCHLEVEL 93 #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/