diff options
author | Hans de Graaff <hans@degraaff.org> | 2017-12-25 08:30:47 +0100 |
---|---|---|
committer | Hans de Graaff <hans@degraaff.org> | 2017-12-25 08:30:47 +0100 |
commit | f711d1bf5230ed58206b7010a592027487c0c897 (patch) | |
tree | 173366dd3d75c2f4638dbab09b729703e5fb511b /patchsets/patches-2.3.6/009_no-gems.patch | |
parent | Add new ruby patchsets (diff) | |
download | ruby-scripts-f711d1bf5230ed58206b7010a592027487c0c897.tar.gz ruby-scripts-f711d1bf5230ed58206b7010a592027487c0c897.tar.bz2 ruby-scripts-f711d1bf5230ed58206b7010a592027487c0c897.zip |
Add patchset for ruby 2.3.6
Diffstat (limited to 'patchsets/patches-2.3.6/009_no-gems.patch')
-rw-r--r-- | patchsets/patches-2.3.6/009_no-gems.patch | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/patchsets/patches-2.3.6/009_no-gems.patch b/patchsets/patches-2.3.6/009_no-gems.patch new file mode 100644 index 0000000..2da6b7d --- /dev/null +++ b/patchsets/patches-2.3.6/009_no-gems.patch @@ -0,0 +1,95 @@ +--- tool/rbinstall.rb.~1~ 2017-03-27 17:18:38.000000000 +0200 ++++ tool/rbinstall.rb 2017-03-30 07:38:53.437332083 +0200 +@@ -696,90 +696,11 @@ + # :startdoc: + + install?(:ext, :comm, :gem) do +- gem_dir = Gem.default_dir +- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) +- prepare "default gems", gem_dir, directories +- +- spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0]) +- default_spec_dir = "#{spec_dir}/default" +- makedirs(default_spec_dir) +- +- gems = {} +- +- Dir.glob(srcdir+"/{lib,ext}/**/*.gemspec").each do |src| +- specgen = RbInstall::Specs::Reader.new(src) +- gems[specgen.gemspec.name] ||= specgen +- end +- +- gems.sort.each do |name, specgen| +- gemspec = specgen.gemspec +- full_name = "#{gemspec.name}-#{gemspec.version}" +- +- puts "#{" "*30}#{gemspec.name} #{gemspec.version}" +- gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec") +- open_for_install(gemspec_path, $data_mode) do +- specgen.spec_source +- end +- +- unless gemspec.executables.empty? then +- bin_dir = File.join(gem_dir, 'gems', full_name, 'bin') +- makedirs(bin_dir) +- +- execs = gemspec.executables.map {|exec| File.join(srcdir, 'bin', exec)} +- install(execs, bin_dir, :mode => $script_mode) +- end +- end ++ # gems are unbundled in Gentoo + end + + install?(:ext, :comm, :gem) do +- gem_dir = Gem.default_dir +- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) +- prepare "bundle gems", gem_dir, directories +- install_dir = with_destdir(gem_dir) +- installed_gems = {} +- options = { +- :install_dir => install_dir, +- :bin_dir => with_destdir(bindir), +- :domain => :local, +- :ignore_dependencies => true, +- :dir_mode => $dir_mode, +- :data_mode => $data_mode, +- :prog_mode => $prog_mode, +- :wrappers => true, +- :format_executable => true, +- } +- Gem::Specification.each_spec([srcdir+'/gems/*']) do |spec| +- ins = RbInstall::UnpackedInstaller.new(spec, options) +- puts "#{" "*30}#{spec.name} #{spec.version}" +- ins.install +- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) +- installed_gems[spec.full_name] = true +- end +- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} +- unless installed_gems.empty? +- install installed_gems, gem_dir+"/cache" +- end +- next if gems.empty? +- if defined?(Zlib) +- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) +- gems.each do |gem| +- begin +- File.umask(022) +- Gem.install(gem, Gem::Requirement.default, options) +- ensure +- File.umask(0222) +- end +- gemname = File.basename(gem) +- puts "#{" "*30}#{gemname}" +- end +- # fix directory permissions +- # TODO: Gem.install should accept :dir_mode option or something +- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) +- # fix .gemspec permissions +- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) +- else +- puts "skip installing bundle gems because of lacking zlib" +- end ++ # gems are unbundled in Gentoo + end + + parse_args() |