Merge pull request #3355 from MSch/fix-installing-bundled-gems-2.2.1

Add fix_installing_bundled_gems.patch for Ruby 2.2.1
rvm · Mar 23, 2015 · 99cb5f6 · 99cb5f6
2 parents b6590b4 + a58579f
commit 99cb5f6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/patches/ruby/2.2.1/fix_installing_bundled_gems.patch b/patches/ruby/2.2.1/fix_installing_bundled_gems.patch
@@ -0,0 +1,14 @@
+--- a/tool/rbinstall.rb
++++ b/tool/rbinstall.rb
+@@ -725,9 +725,9 @@
+     end
+     # fix directory permissions
+     # TODO: Gem.install should accept :dir_mode option or something
+-    File.chmod($dir_mode, *Dir.glob(with_destdir(Gem.dir)+"/**/"))
++    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"))
++    File.chmod($data_mode, *Dir.glob(with_destdir(gem_dir)+"/specifications/*.gemspec"))
+   else
+     puts "skip installing bundle gems because of lacking zlib"
+   end
diff --git a/patchsets/ruby/2.2.1/default b/patchsets/ruby/2.2.1/default
@@ -0,0 +1 @@
+fix_installing_bundled_gems