summaryrefslogtreecommitdiff
path: root/lang/ruby25/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/ruby25/files')
-rw-r--r--lang/ruby25/files/patch-configure.ac37
-rw-r--r--lang/ruby25/files/patch-lib_mkmf.rb11
-rw-r--r--lang/ruby25/files/patch-lib_rdoc_generator_json__index.rb20
-rw-r--r--lang/ruby25/files/patch-tool_mkconfig.rb14
-rw-r--r--lang/ruby25/files/patch-tool_rbinstall.rb150
5 files changed, 0 insertions, 232 deletions
diff --git a/lang/ruby25/files/patch-configure.ac b/lang/ruby25/files/patch-configure.ac
deleted file mode 100644
index 863230942a2c..000000000000
--- a/lang/ruby25/files/patch-configure.ac
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.ac.orig 2018-01-03 18:12:16 UTC
-+++ configure.ac
-@@ -2482,7 +2482,7 @@ AS_IF([test "$ac_cv_func_qsort_r" != no]
- AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,
- [AC_TRY_COMPILE([
- @%:@include <stdlib.h>
--void qsort_r(void *base, size_t nmemb, size_t size,
-+void (qsort_r)(void *base, size_t nmemb, size_t size,
- int (*compar)(const void *, const void *, void *),
- void *arg);
- ],[ ],
-@@ -2492,7 +2492,7 @@ void qsort_r(void *base, size_t nmemb, s
- AC_CACHE_CHECK(whether qsort_r is BSD version, rb_cv_bsd_qsort_r,
- [AC_TRY_COMPILE([
- @%:@include <stdlib.h>
--void qsort_r(void *base, size_t nmemb, size_t size,
-+void (qsort_r)(void *base, size_t nmemb, size_t size,
- void *arg, int (*compar)(void *, const void *, const void *));
- ],[ ],
- [rb_cv_bsd_qsort_r=yes],
-@@ -3245,7 +3245,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
- : ${LDSHARED='$(CC) -shared'}
- AS_IF([test "$rb_cv_binary_elf" = yes], [
- LDFLAGS="$LDFLAGS -rdynamic"
-- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
-+ DLDFLAGS="$DLDFLAGS "'-Wl,-E'
- ], [
- test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
- ])
-@@ -3724,6 +3724,7 @@ AS_CASE("$enable_shared", [yes], [
- SOLIBS='$(LIBS)'
- LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
- LIBRUBY_SONAME='$(LIBRUBY_SO)'
-+ RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
- AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
- LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
- LIBRUBY_ALIASES=''
diff --git a/lang/ruby25/files/patch-lib_mkmf.rb b/lang/ruby25/files/patch-lib_mkmf.rb
deleted file mode 100644
index f333fdfd2e67..000000000000
--- a/lang/ruby25/files/patch-lib_mkmf.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/mkmf.rb.orig 2018-10-09 14:09:35 UTC
-+++ lib/mkmf.rb
-@@ -234,7 +234,7 @@ module MakeMakefile
- end
- $extmk ||= false
- if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
-- $topdir = $hdrdir
-+ $topdir = $hdrdir + "/" + "#{CONFIG['arch']}/ruby/"
- $top_srcdir = $hdrdir
- $arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"]
- elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h")
diff --git a/lang/ruby25/files/patch-lib_rdoc_generator_json__index.rb b/lang/ruby25/files/patch-lib_rdoc_generator_json__index.rb
deleted file mode 100644
index 1152e4201544..000000000000
--- a/lang/ruby25/files/patch-lib_rdoc_generator_json__index.rb
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/rdoc/generator/json_index.rb.orig 2017-11-27 10:45:24 UTC
-+++ lib/rdoc/generator/json_index.rb
-@@ -175,7 +175,7 @@ class RDoc::Generator::JsonIndex
- debug_msg "Writing gzipped search index to %s" % outfile
-
- Zlib::GzipWriter.open(outfile) do |gz|
-- gz.mtime = File.mtime(search_index_file)
-+ gz.mtime = 1
- gz.orig_name = search_index_file.basename.to_s
- gz.write search_index
- gz.close
-@@ -193,7 +193,7 @@ class RDoc::Generator::JsonIndex
- debug_msg "Writing gzipped file to %s" % outfile
-
- Zlib::GzipWriter.open(outfile) do |gz|
-- gz.mtime = File.mtime(dest)
-+ gz.mtime = 1
- gz.orig_name = dest.basename.to_s
- gz.write data
- gz.close
diff --git a/lang/ruby25/files/patch-tool_mkconfig.rb b/lang/ruby25/files/patch-tool_mkconfig.rb
deleted file mode 100644
index 66ad748e54d4..000000000000
--- a/lang/ruby25/files/patch-tool_mkconfig.rb
+++ /dev/null
@@ -1,14 +0,0 @@
---- tool/mkconfig.rb.orig 2017-05-02 12:45:07 UTC
-+++ tool/mkconfig.rb
-@@ -157,8 +157,9 @@ def vars.expand(val, config = self)
- val.replace(newval) unless newval == val
- val
- end
--prefix = vars.expand(vars["prefix"] ||= "")
--rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "")
-+prefix = vars.expand(vars["rubyarchdir"])
-+major, minor, *rest = RUBY_VERSION.split('.')
-+rubyarchdir = "/lib/ruby/#{major}.#{minor}/#{arch}"
- relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir
- puts %[\
- # encoding: ascii-8bit
diff --git a/lang/ruby25/files/patch-tool_rbinstall.rb b/lang/ruby25/files/patch-tool_rbinstall.rb
deleted file mode 100644
index 71c4a24f0b28..000000000000
--- a/lang/ruby25/files/patch-tool_rbinstall.rb
+++ /dev/null
@@ -1,150 +0,0 @@
---- tool/rbinstall.rb.orig 2019-02-05 12:15:47 UTC
-+++ tool/rbinstall.rb
-@@ -325,6 +325,7 @@ bindir = CONFIG["bindir", true]
- libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
- rubyhdrdir = CONFIG["rubyhdrdir", true]
- archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch'])
-+libdatadir = CONFIG["prefix", true] + "/" + "libdata"
- rubylibdir = CONFIG["rubylibdir", true]
- archlibdir = CONFIG["rubyarchdir", true]
- sitelibdir = CONFIG["sitelibdir"]
-@@ -378,7 +379,7 @@ end
- install?(:local, :arch, :data) do
- pc = CONFIG["ruby_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(libdatadir, "pkgconfig")
- install pc, pkgconfigdir, :mode => $data_mode
- end
- end
-@@ -762,130 +763,6 @@ end
-
- # :startdoc:
-
--install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do
-- install_default_gem('lib', srcdir)
--end
--install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
-- install_default_gem('ext', srcdir)
--end
--
--def load_gemspec(file)
-- code = File.read(file, encoding: "utf-8:-")
-- code.gsub!(/`git.*?`/m, '""')
-- begin
-- spec = eval(code, binding, file)
-- rescue SignalException, SystemExit
-- raise
-- rescue SyntaxError, Exception
-- end
-- raise("invalid spec in #{file}") unless spec
-- spec.loaded_from = file
-- spec
--end
--
--def install_default_gem(dir, srcdir)
-- gem_dir = Gem.default_dir
-- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
-- prepare "default gems from #{dir}", 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}/#{dir}/**/*.gemspec").map {|src|
-- spec = load_gemspec(src)
-- file_collector = RbInstall::Specs::FileCollector.new(src)
-- files = file_collector.collect
-- next if files.empty?
-- spec.files = files
-- spec
-- }
-- gems.compact.sort_by(&:name).each do |gemspec|
-- full_name = "#{gemspec.name}-#{gemspec.version}"
--
-- puts "#{INDENT}#{gemspec.name} #{gemspec.version}"
-- gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec")
-- open_for_install(gemspec_path, $data_mode) do
-- gemspec.to_ruby
-- end
--
-- unless gemspec.executables.empty? then
-- bin_dir = File.join(gem_dir, 'gems', full_name, gemspec.bindir)
-- makedirs(bin_dir)
--
-- gemspec.executables.map {|exec|
-- $script_installer.install(File.join(srcdir, 'bin', exec),
-- File.join(bin_dir, exec))
-- }
-- end
-- end
--end
--
--install?(:ext, :comm, :gem, :'bundled-gems') do
-- gem_dir = Gem.default_dir
-- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
-- prepare "bundled 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_ext_dir = "#$extout/gems/#{CONFIG['arch']}"
-- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
-- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path|
-- spec = load_gemspec(path)
-- next unless spec.platform == Gem::Platform::RUBY
-- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1]
-- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
-- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
-- spec.extensions[0] ||= "-"
-- end
-- ins = RbInstall::UnpackedInstaller.new(spec, options)
-- puts "#{INDENT}#{spec.name} #{spec.version}"
-- ins.install
-- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec"))
-- unless spec.extensions.empty?
-- install_recursive(ext, spec.extension_dir)
-- end
-- 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)))
-- silent = Gem::SilentUI.new
-- gems.each do |gem|
-- inst = Gem::Installer.new(gem, options)
-- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir)
-- begin
-- Gem::DefaultUserInteraction.use_ui(silent) {inst.install}
-- rescue Gem::InstallError => e
-- next
-- end
-- gemname = File.basename(gem)
-- puts "#{INDENT}#{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 bundled gems because of lacking zlib"
-- end
--end
--
- parse_args()
-
- include FileUtils
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-21 14:20:17 +0000