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

ruby-changes:71486

From: Nobuyoshi <ko1@a...>
Date: Thu, 24 Mar 2022 08:59:43 +0900 (JST)
Subject: [ruby-changes:71486] 1357b14750 (master): Now all extension libraries must consider the ABI header

https://git.ruby-lang.org/ruby.git/commit/?id=1357b14750

From 1357b14750275d2f2d13896688064e1a243007dd Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 24 Mar 2022 08:59:24 +0900
Subject: Now all extension libraries must consider the ABI header

---
 spec/ruby/optional/capi/spec_helper.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/ruby/optional/capi/spec_helper.rb b/spec/ruby/optional/capi/spec_helper.rb
index 9bd2d9791c..ec6b909397 100644
--- a/spec/ruby/optional/capi/spec_helper.rb
+++ b/spec/ruby/optional/capi/spec_helper.rb
@@ -29,7 +29,9 @@ def compile_extension(name) https://github.com/ruby/ruby/blob/trunk/spec/ruby/optional/capi/spec_helper.rb#L29
 
   ext = "#{name}_spec"
   lib = "#{object_path}/#{ext}.#{RbConfig::CONFIG['DLEXT']}"
-  ruby_header = "#{RbConfig::CONFIG['rubyhdrdir']}/ruby.h"
+  rubyhdrdir = RbConfig::CONFIG['rubyhdrdir']
+  ruby_header = "#{rubyhdrdir}/ruby.h"
+  abi_header = "#{rubyhdrdir}/ruby/internal/abi.h"
 
   if RbConfig::CONFIG["ENABLE_SHARED"] == "yes"
     libdirname = RbConfig::CONFIG['libdirname'] # defined since 2.1
@@ -45,6 +47,7 @@ def compile_extension(name) https://github.com/ruby/ruby/blob/trunk/spec/ruby/optional/capi/spec_helper.rb#L47
     when mtime <= File.mtime("#{core_ext_dir}/rubyspec.h")
     when mtime <= File.mtime("#{spec_ext_dir}/#{ext}.c")
     when mtime <= File.mtime(ruby_header)
+    when (mtime <= File.mtime(abi_header) rescue nil)
     when libruby && mtime <= File.mtime(libruby)
     else
       return lib # up-to-date
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

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