Changeset View
Changeset View
Standalone View
Standalone View
head/lang/ruby23/files/patch-tool_rbinstall.rb
| --- tool/rbinstall.rb.orig 2015-11-16 06:33:17 UTC | --- tool/rbinstall.rb.orig 2017-03-27 15:18:38 UTC | ||||
| +++ tool/rbinstall.rb | +++ tool/rbinstall.rb | ||||
| @@ -322,6 +322,7 @@ bindir = CONFIG["bindir", true] | @@ -322,6 +322,7 @@ bindir = CONFIG["bindir", true] | ||||
| libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true] | libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true] | ||||
| rubyhdrdir = CONFIG["rubyhdrdir", true] | rubyhdrdir = CONFIG["rubyhdrdir", true] | ||||
| archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch']) | archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch']) | ||||
| +libdatadir = CONFIG["prefix", true] + "/" + "libdata" | +libdatadir = CONFIG["prefix", true] + "/" + "libdata" | ||||
| rubylibdir = CONFIG["rubylibdir", true] | rubylibdir = CONFIG["rubylibdir", true] | ||||
| archlibdir = CONFIG["rubyarchdir", true] | archlibdir = CONFIG["rubyarchdir", true] | ||||
| sitelibdir = CONFIG["sitelibdir"] | sitelibdir = CONFIG["sitelibdir"] | ||||
| @@ -376,7 +377,7 @@ end | @@ -376,7 +377,7 @@ end | ||||
| install?(:local, :arch, :data) do | install?(:local, :arch, :data) do | ||||
| pc = CONFIG["ruby_pc"] | pc = CONFIG["ruby_pc"] | ||||
| if pc and File.file?(pc) and File.size?(pc) | if pc and File.file?(pc) and File.size?(pc) | ||||
| - prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig") | - prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig") | ||||
| + prepare "pkgconfig data", pkgconfigdir = File.join(libdatadir, "pkgconfig") | + prepare "pkgconfig data", pkgconfigdir = File.join(libdatadir, "pkgconfig") | ||||
| install pc, pkgconfigdir, :mode => $data_mode | install pc, pkgconfigdir, :mode => $data_mode | ||||
| end | end | ||||
| end | end | ||||
| @@ -695,88 +696,6 @@ end | @@ -695,93 +696,6 @@ end | ||||
| # :startdoc: | # :startdoc: | ||||
| -install?(:ext, :comm, :gem) do | -install?(:ext, :comm, :gem) do | ||||
| - gem_dir = Gem.default_dir | - gem_dir = Gem.default_dir | ||||
| - directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) | - directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) | ||||
| - prepare "default gems", gem_dir, directories | - prepare "default gems", gem_dir, directories | ||||
| - | - | ||||
| ▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Lines | |||||
| - installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} | - installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} | ||||
| - unless installed_gems.empty? | - unless installed_gems.empty? | ||||
| - install installed_gems, gem_dir+"/cache" | - install installed_gems, gem_dir+"/cache" | ||||
| - end | - end | ||||
| - next if gems.empty? | - next if gems.empty? | ||||
| - if defined?(Zlib) | - if defined?(Zlib) | ||||
| - Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) | - Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) | ||||
| - gems.each do |gem| | - gems.each do |gem| | ||||
| - begin | |||||
| - File.umask(022) | |||||
| - Gem.install(gem, Gem::Requirement.default, options) | - Gem.install(gem, Gem::Requirement.default, options) | ||||
| - ensure | |||||
| - File.umask(0222) | |||||
| - end | |||||
| - gemname = File.basename(gem) | - gemname = File.basename(gem) | ||||
| - puts "#{" "*30}#{gemname}" | - puts "#{" "*30}#{gemname}" | ||||
| - end | - end | ||||
| - # fix directory permissions | - # fix directory permissions | ||||
| - # TODO: Gem.install should accept :dir_mode option or something | - # TODO: Gem.install should accept :dir_mode option or something | ||||
| - File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) | - File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) | ||||
| - # fix .gemspec permissions | - # fix .gemspec permissions | ||||
| - File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) | - File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) | ||||
| - else | - else | ||||
| - puts "skip installing bundle gems because of lacking zlib" | - puts "skip installing bundle gems because of lacking zlib" | ||||
| - end | - end | ||||
| -end | -end | ||||
| - | - | ||||
| parse_args() | parse_args() | ||||
| include FileUtils | include FileUtils | ||||