diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | tool/rbinstall.rb | 36 |
2 files changed, 26 insertions, 14 deletions
@@ -1,3 +1,7 @@ +Fri Dec 26 01:41:40 2014 NAKAMURA Usaku <usa@ruby-lang.org> + + * tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable. + Fri Dec 26 01:24:42 2014 NAKAMURA Usaku <usa@ruby-lang.org> * tool/downloader.rb: support old versions of ruby. diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 98e601e843..4a6bae0ce9 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -709,20 +709,28 @@ install?(:ext, :comm, :gem) do end install?(:ext, :comm, :gem) do - require 'pathname' - gem_dir = Gem.default_dir - directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) - prepare "bundle gems", gem_dir, directories - Dir.glob(srcdir+'/gems/*.gem').each do |gem| - Gem.install gem, Gem::Requirement.default, :install_dir => with_destdir(Gem.dir), :domain => :local, :ignore_dependencies => true - gemname = Pathname(gem).basename - puts "#{" "*30}#{gemname}" - end - # fix directory permissions - # TODO: Gem.install should accept :dir_mode option or something - File.chmod($dir_mode, *Dir.glob(with_destdir(Gem.dir)+"/**/")) - # fix .gemspec permissions - File.chmod($data_mode, *Dir.glob(with_destdir(Gem.dir)+"/specifications/*.gemspec")) + begin + require "zlib" + rescue LoadErroe + end + if defined?(Zlib) + require 'pathname' + gem_dir = Gem.default_dir + directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) + prepare "bundle gems", gem_dir, directories + Dir.glob(srcdir+'/gems/*.gem').each do |gem| + Gem.install gem, Gem::Requirement.default, :install_dir => with_destdir(Gem.dir), :domain => :local, :ignore_dependencies => true + gemname = Pathname(gem).basename + puts "#{" "*30}#{gemname}" + end + # fix directory permissions + # TODO: Gem.install should accept :dir_mode option or something + File.chmod($dir_mode, *Dir.glob(with_destdir(Gem.dir)+"/**/")) + # fix .gemspec permissions + File.chmod($data_mode, *Dir.glob(with_destdir(Gem.dir)+"/specifications/*.gemspec")) + else + puts "skip installing bundle gems because of lacking zlib" + end end parse_args() |