diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rubygems/ext/ext_conf_builder.rb | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sun Mar 17 23:28:44 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build): + clear DESTDIR so RUBYARCHDIR and RUBYLIBDIR are not be overrdden. + [Bug #7698] + Sun Mar 17 23:26:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build): diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb index 2977cf0207..3df7637581 100644 --- a/lib/rubygems/ext/ext_conf_builder.rb +++ b/lib/rubygems/ext/ext_conf_builder.rb @@ -31,6 +31,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder 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::Ext::Builder results ensure ENV["RUBYOPT"] = rubyopt + ENV["DESTDIR"] = destdir siteconf.close(true) if siteconf FileUtils.rm_rf tmp_dest if tmp_dest end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-17" -#define RUBY_PATCHLEVEL 62 +#define RUBY_PATCHLEVEL 63 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 |
