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

ruby-changes:74224

From: Nobuyoshi <ko1@a...>
Date: Mon, 24 Oct 2022 17:48:56 +0900 (JST)
Subject: [ruby-changes:74224] 6700fa7f62 (master): Set timestamp path for the target path to TARGET_SO_DIR_TIMESTAMP

https://git.ruby-lang.org/ruby.git/commit/?id=6700fa7f62

From 6700fa7f62b040b5f69c3c5c3f5dbe740910c990 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 24 Oct 2022 13:16:06 +0900
Subject: Set timestamp path for the target path to TARGET_SO_DIR_TIMESTAMP

---
 lib/mkmf.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 86ba70ed19..3d0beebbf2 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -2383,6 +2383,7 @@ TARGET_SO_DIR =#{$extout ? " $(RUBYARCHDIR)/" : ''} https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2383
 TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
 CLEANLIBS     = #{'$(TARGET_SO) ' if target}#{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
 CLEANOBJS     = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak
+TARGET_SO_DIR_TIMESTAMP = #{timestamp_file(sodir, target_prefix)}
 " #"
 
     conf = yield(conf) if block_given?
@@ -2416,7 +2417,7 @@ static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{$extout ? " install-rb" : https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2417
     if target
       f = "$(DLLIB)"
       dest = "$(TARGET_SO)"
-      stamp = timestamp_file(dir, target_prefix)
+      stamp = '$(TARGET_SO_DIR_TIMESTAMP)'
       if $extout
         mfile.puts dest
         mfile.print "clean-so::\n"
@@ -2485,7 +2486,9 @@ static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{$extout ? " install-rb" : https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2486
         end
       end
     end
-    dirs.unshift(sodir) if target and !dirs.include?(sodir)
+    if target and !dirs.include?(sodir)
+      mfile.print "$(TARGET_SO_DIR_TIMESTAMP):\n\t$(Q) $(MAKEDIRS) $(@D) #{sodir}\n\t$(Q) $(TOUCH) $@\n"
+    end
     dirs.each do |d|
       t = timestamp_file(d, target_prefix)
       mfile.print "#{t}:\n\t$(Q) $(MAKEDIRS) $(@D) #{d}\n\t$(Q) $(TOUCH) $@\n"
@@ -2529,7 +2532,7 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2532
     mfile.print "$(TARGET_SO): "
     mfile.print "$(DEFFILE) " if makedef
     mfile.print "$(OBJS) Makefile"
-    mfile.print " #{timestamp_file(sodir, target_prefix)}" if $extout
+    mfile.print " $(TARGET_SO_DIR_TIMESTAMP)" if $extout
     mfile.print "\n"
     mfile.print "\t$(ECHO) linking shared-object #{target_prefix.sub(/\A\/(.*)/, '\1/')}$(DLLIB)\n"
     mfile.print "\t-$(Q)$(RM) $(@#{sep})\n"
-- 
cgit v1.2.3


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

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