ruby-changes:43983
From: nobu <ko1@a...>
Date: Thu, 1 Sep 2016 16:02:37 +0900 (JST)
Subject: [ruby-changes:43983] nobu:r56056 (trunk): mkmf.rb: architecture timestamp directories
nobu 2016-09-01 16:02:32 +0900 (Thu, 01 Sep 2016) New Revision: 56056 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56056 Log: mkmf.rb: architecture timestamp directories * lib/mkmf.rb (timestamp_file): substitute TARGET_SO_DIR with RUBYARCHDIR seprately from other normal paths, to make timestamp files for architecture dependent directories separately. and remove RUBYCOMMONDIR prefix. Modified files: trunk/lib/mkmf.rb Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 56055) +++ lib/mkmf.rb (revision 56056) @@ -2019,12 +2019,13 @@ preload = #{defined?($preload) && $prelo https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2019 end def timestamp_file(name, target_prefix = nil) - pat = {'TARGET_SO_DIR'=>'$(RUBYARCHDIR)'} + pat = {} + name = '$(RUBYARCHDIR)' if name == '$(TARGET_SO_DIR)' install_dirs.each do |n, d| pat[n] = $` if /\$\(target_prefix\)\z/ =~ d end name = name.gsub(/\$\((#{pat.keys.join("|")})\)/) {pat[$1]+target_prefix} - name.sub!(/\A\$\(extout\)\//, '') + name.sub!(/\A\$\((?:extout|RUBYCOMMONDIR)\)\/*/, '') name.sub!(/(\$\((?:site)?arch\))\/*/, '') arch = $1 || '' name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "" : $2 ? ".-." : "_"} -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/