ruby-changes:8164
From: nobu <ko1@a...>
Date: Sun, 5 Oct 2008 23:34:56 +0900 (JST)
Subject: [ruby-changes:8164] Ruby:r19692 (trunk): * lib/mkmf.rb ($config_h): now always defines for old libraries.
nobu 2008-10-05 23:34:37 +0900 (Sun, 05 Oct 2008) New Revision: 19692 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19692 Log: * lib/mkmf.rb ($config_h): now always defines for old libraries. Modified files: trunk/ChangeLog trunk/ext/extmk.rb trunk/lib/mkmf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 19691) +++ ChangeLog (revision 19692) @@ -1,3 +1,7 @@ +Sun Oct 5 23:34:28 2008 Nobuyoshi Nakada <nobu@r...> + + * lib/mkmf.rb ($config_h): now always defines for old libraries. + Sun Oct 5 23:06:55 2008 Nobuyoshi Nakada <nobu@r...> * vm_method.c (rb_mod_modfunc): method undefined in included module Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 19691) +++ lib/mkmf.rb (revision 19692) @@ -13,7 +13,8 @@ CXX_EXT.concat(%w[C]) end SRC_EXT = %w[c m] << CXX_EXT -$static = $config_h = nil +$static = nil +$config_h = '$(arch_hdrdir)/ruby/config.h' $default_static = $static unless defined? $configure_args @@ -1441,7 +1442,7 @@ end depend.each_line do |line| line.gsub!(/\.o\b/, ".#{$OBJEXT}") - line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) if $config_h + line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h) line.gsub!(%r"\$\(hdrdir\)/(?!ruby(?![^:;/\s]))(?=[-\w]+\.h)", '\&ruby/') if $nmake && /\A\s*\$\(RM|COPY\)/ =~ line line.gsub!(%r"[-\w\./]{2,}"){$&.tr("/", "\\")} @@ -1742,7 +1743,7 @@ if RULE_SUBST headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))} end - headers << $config_h if $config_h + headers << $config_h headers << '$(RUBY_EXTCONF_H)' if $extconf_h mfile.print "$(OBJS): ", headers.join(' '), "\n" end Index: ext/extmk.rb =================================================================== --- ext/extmk.rb (revision 19691) +++ ext/extmk.rb (revision 19692) @@ -343,7 +343,6 @@ ENV["RUBYLIB"] = "-" ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}" end -$config_h = '$(arch_hdrdir)/ruby/config.h' $mflags << "ruby=#$ruby" MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)} -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/