From ee485d5d511794b3579ff8f33cae1dae1b3fb917 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 26 Dec 2014 06:44:52 +0000
Subject: merge revision(s) 49015,49016: [Backport #10647]

	* tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable.
	  [Bug #10647] [ruby-dev:48787]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         |  5 +++++
 tool/rbinstall.rb | 36 ++++++++++++++++++++++--------------
 version.h         |  6 +++---
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6400e89691..abc5399e4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 26 15:42:27 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable.
+	  [Bug #10647] [ruby-dev:48787]
+
 Thu Dec 25 17:42:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/io/console/console.c (console_dev): send the given arguments
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()
diff --git a/version.h b/version.h
index eacc75f589..51b7b640a9 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2014-12-25"
-#define RUBY_PATCHLEVEL 0
+#define RUBY_RELEASE_DATE "2014-12-26"
+#define RUBY_PATCHLEVEL 1
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.3