kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Make the timestamp path correspond to the bundled target path

Browse source 
So different timestamps for different paths will be used.  Extentions
paths in bundled gems contain `ruby_version`, which includes the ABI
version, and the same timestamp file for different paths resulted in
build failures when it changed.
This commit is contained in:
Nobuyoshi Nakada 2022-10-24 12:49:45 +09:00
parent 3af373285b
commit 711b2ed5fe
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ext/extmk.rb
View file

@ -536,9 +536,14 @@ extend Module.new {
def timestamp_file(name, target_prefix = nil) def timestamp_file(name, target_prefix = nil)
if @gemname and name == '$(TARGET_SO_DIR)' if @gemname and name == '$(TARGET_SO_DIR)'
name = "$(arch)/gems/#{@gemname}#{target_prefix}" gem = true
name = "$(gem_platform)/$(ruby_version)/gems/#{@gemname}#{target_prefix}"
end end
super.sub(%r[/\.extout\.(?:-\.)?], '/.') path = super.sub(%r[/\.extout\.(?:-\.)?], '/.')
if gem
nil while path.sub!(%r[/\.(gem_platform|ruby_version)\.-(?=\.)], '/$(\1)/')
end
path
end end
def configuration(srcdir) def configuration(srcdir)