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

ruby-changes:27540

From: nobu <ko1@a...>
Date: Tue, 5 Mar 2013 10:06:17 +0900 (JST)
Subject: [ruby-changes:27540] nobu:r39592 (trunk): ext_conf_builder.rb: clear DESTDIR

nobu	2013-03-05 10:06:08 +0900 (Tue, 05 Mar 2013)

  New Revision: 39592

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39592

  Log:
    ext_conf_builder.rb: clear DESTDIR
    
    * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
      clear DESTDIR so RUBYARCHDIR and RUBYLIBDIR are not be overrdden.
      [Bug #7698]

  Modified files:
    trunk/lib/rubygems/ext/ext_conf_builder.rb

Index: lib/rubygems/ext/ext_conf_builder.rb
===================================================================
--- lib/rubygems/ext/ext_conf_builder.rb	(revision 39591)
+++ lib/rubygems/ext/ext_conf_builder.rb	(revision 39592)
@@ -31,6 +31,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ex https://github.com/ruby/ruby/blob/trunk/lib/rubygems/ext/ext_conf_builder.rb#L31
 
     run cmd, results
 
+    destdir = ENV["DESTDIR"]
+    ENV["DESTDIR"] = nil
+
     make dest_path, results
 
     if tmp_dest
@@ -43,6 +46,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ex https://github.com/ruby/ruby/blob/trunk/lib/rubygems/ext/ext_conf_builder.rb#L46
     results
   ensure
     ENV["RUBYOPT"] = rubyopt
+    ENV["DESTDIR"] = destdir
     siteconf.close(true) if siteconf
     FileUtils.rm_rf tmp_dest if tmp_dest
   end

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

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