summaryrefslogtreecommitdiff
path: root/lang/ruby33/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/ruby33/files')
-rw-r--r--lang/ruby33/files/patch-configure.ac36
-rw-r--r--lang/ruby33/files/patch-lib_mkmf.rb11
-rw-r--r--lang/ruby33/files/patch-lib_rdoc_generator_json__index.rb20
-rw-r--r--lang/ruby33/files/patch-tool_mkconfig.rb14
-rw-r--r--lang/ruby33/files/patch-tool_rbinstall.rb172
5 files changed, 253 insertions, 0 deletions
diff --git a/lang/ruby33/files/patch-configure.ac b/lang/ruby33/files/patch-configure.ac
new file mode 100644
index 000000000000..e4be99dafceb
--- /dev/null
+++ b/lang/ruby33/files/patch-configure.ac
@@ -0,0 +1,36 @@
+--- configure.ac.orig 2023-05-12 09:25:10 UTC
++++ configure.ac
+@@ -1342,7 +1342,7 @@ AC_CHECK_HEADERS(syscall.h)
+ AC_CHECK_HEADERS(time.h)
+ AC_CHECK_HEADERS(ucontext.h)
+ AC_CHECK_HEADERS(utime.h)
+-AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
++AS_CASE("$target_cpu", [amd64|x64|x86_64|i[3-6]86*], [
+ AC_CHECK_HEADERS(x86intrin.h)
+ ])
+ RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
+@@ -3056,7 +3056,7 @@ AC_SUBST(EXTOBJS)
+ : ${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'
+ ])
+@@ -3515,6 +3515,7 @@ AS_CASE("$enable_shared", [yes], [
+ [freebsd*|dragonfly*], [
+ 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=''
+@@ -4325,6 +4326,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
+ arch="${target_cpu}-mingw-ucrt"
+ ], [
+ arch="${target_cpu}-${target_os}"
++ AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
+ ])
+ AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
+ ])
diff --git a/lang/ruby33/files/patch-lib_mkmf.rb b/lang/ruby33/files/patch-lib_mkmf.rb
new file mode 100644
index 000000000000..bc9be47fbaad
--- /dev/null
+++ b/lang/ruby33/files/patch-lib_mkmf.rb
@@ -0,0 +1,11 @@
+--- lib/mkmf.rb.orig 2023-05-12 09:25:10 UTC
++++ lib/mkmf.rb
+@@ -222,7 +222,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/ruby33/files/patch-lib_rdoc_generator_json__index.rb b/lang/ruby33/files/patch-lib_rdoc_generator_json__index.rb
new file mode 100644
index 000000000000..7f6277092c56
--- /dev/null
+++ b/lang/ruby33/files/patch-lib_rdoc_generator_json__index.rb
@@ -0,0 +1,20 @@
+--- lib/rdoc/generator/json_index.rb.orig 2023-05-12 09:25:10 UTC
++++ lib/rdoc/generator/json_index.rb
+@@ -178,7 +178,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
+@@ -196,7 +196,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/ruby33/files/patch-tool_mkconfig.rb b/lang/ruby33/files/patch-tool_mkconfig.rb
new file mode 100644
index 000000000000..0ae0d3482f7d
--- /dev/null
+++ b/lang/ruby33/files/patch-tool_mkconfig.rb
@@ -0,0 +1,14 @@
+--- tool/mkconfig.rb.orig 2023-05-12 09:25:10 UTC
++++ tool/mkconfig.rb
+@@ -169,8 +169,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 %[\
diff --git a/lang/ruby33/files/patch-tool_rbinstall.rb b/lang/ruby33/files/patch-tool_rbinstall.rb
new file mode 100644
index 000000000000..2afb8e198290
--- /dev/null
+++ b/lang/ruby33/files/patch-tool_rbinstall.rb
@@ -0,0 +1,172 @@
+--- tool/rbinstall.rb.orig 2023-05-12 09:25:10 UTC
++++ tool/rbinstall.rb
+@@ -909,169 +909,6 @@ end
+
+ # :startdoc:
+
+-install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do
+- install_default_gem('lib', srcdir, bindir)
+-end
+-install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
+- install_default_gem('ext', srcdir, bindir)
+-end
+-
+-def load_gemspec(file, base = nil)
+- file = File.realpath(file)
+- code = File.read(file, encoding: "utf-8:-")
+- code.gsub!(/(?:`git[^\`]*`|%x\[git[^\]]*\])\.split\([^\)]*\)/m) do
+- files = []
+- if base
+- Dir.glob("**/*", File::FNM_DOTMATCH, base: base) do |n|
+- case File.basename(n); when ".", ".."; next; end
+- next if File.directory?(File.join(base, n))
+- files << n.dump
+- end
+- end
+- "[" + files.join(", ") + "]"
+- end
+- spec = eval(code, binding, file)
+- unless Gem::Specification === spec
+- raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
+- end
+- spec.loaded_from = base ? File.join(base, File.basename(file)) : file
+- spec.files.reject! {|n| n.end_with?(".gemspec") or n.start_with?(".git")}
+- spec.date = RUBY_RELEASE_DATE
+-
+- spec
+-end
+-
+-def install_default_gem(dir, srcdir, bindir)
+- gem_dir = Gem.default_dir
+- install_dir = with_destdir(gem_dir)
+- prepare "default gems from #{dir}", gem_dir
+- RbInstall.no_write do
+- makedirs(Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
+- end
+-
+- options = {
+- :install_dir => with_destdir(gem_dir),
+- :bin_dir => with_destdir(bindir),
+- :ignore_dependencies => true,
+- :dir_mode => $dir_mode,
+- :data_mode => $data_mode,
+- :prog_mode => $script_mode,
+- :wrappers => true,
+- :format_executable => true,
+- :install_as_default => true,
+- }
+- default_spec_dir = Gem.default_specifications_dir
+-
+- base = "#{srcdir}/#{dir}"
+- gems = Dir.glob("**/*.gemspec", base: base).map {|src|
+- spec = load_gemspec("#{base}/#{src}")
+- file_collector = RbInstall::Specs::FileCollector.for(srcdir, dir, src)
+- files = file_collector.collect
+- if file_collector.skip_install?(files)
+- next
+- end
+- spec.files = files
+- spec
+- }
+- gems.compact.sort_by(&:name).each do |gemspec|
+- old_gemspecs = Dir[File.join(with_destdir(default_spec_dir), "#{gemspec.name}-*.gemspec")]
+- if old_gemspecs.size > 0
+- old_gemspecs.each {|spec| rm spec }
+- end
+-
+- full_name = "#{gemspec.name}-#{gemspec.version}"
+-
+- gemspec.loaded_from = File.join srcdir, gemspec.spec_name
+-
+- package = RbInstall::DirPackage.new gemspec, {gemspec.bindir => 'libexec'}
+- ins = RbInstall::UnpackedInstaller.new(package, options)
+- puts "#{INDENT}#{gemspec.name} #{gemspec.version}"
+- ins.install
+- end
+-end
+-
+-install?(:ext, :comm, :gem, :'bundled-gems') do
+- gem_dir = Gem.default_dir
+- install_dir = with_destdir(gem_dir)
+- prepare "bundled gems", gem_dir
+- RbInstall.no_write do
+- makedirs(Gem.ensure_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
+- end
+-
+- installed_gems = {}
+- skipped = {}
+- 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 => $script_mode,
+- :wrappers => true,
+- :format_executable => true,
+- }
+-
+- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
+- specifications_dir = File.join(gem_dir, "specifications")
+- build_dir = Gem::StubSpecification.gemspec_stub("", ".bundle", ".bundle").extensions_dir
+-
+- # We are about to build extensions, and want to configure extensions with the
+- # newly installed ruby.
+- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
+- # Prevent fake.rb propagation. It conflicts with the natural mkmf configs of
+- # the newly installed ruby.
+- ENV.delete('RUBYOPT')
+-
+- File.foreach("#{srcdir}/gems/bundled_gems") do |name|
+- next if /^\s*(?:#|$)/ =~ name
+- next unless /^(\S+)\s+(\S+).*/ =~ name
+- gem_name = "#$1-#$2"
+- # Try to find the gemspec file for C ext gems
+- # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec
+- # This gemspec keep the original dependencies
+- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
+- unless File.exist?(path)
+- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
+- unless File.exist?(path)
+- skipped[gem_name] = "gemspec not found"
+- next
+- end
+- end
+- spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")
+- unless spec.platform == Gem::Platform::RUBY
+- skipped[gem_name] = "not ruby platform (#{spec.platform})"
+- next
+- end
+- unless spec.full_name == gem_name
+- skipped[gem_name] = "full name unmatch #{spec.full_name}"
+- next
+- end
+- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
+- package = RbInstall::DirPackage.new spec
+- ins = RbInstall::UnpackedInstaller.new(package, options)
+- puts "#{INDENT}#{spec.name} #{spec.version}"
+- ins.install
+- install_recursive("#{build_dir}/#{gem_name}", "#{extensions_dir}/#{gem_name}") do |src, dest|
+- # puts "#{INDENT} #{dest[extensions_dir.size+gem_name.size+2..-1]}"
+- install src, dest, :mode => (File.executable?(src) ? $prog_mode : $data_mode)
+- 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?
+- prepare "bundled gem cache", gem_dir+"/cache"
+- install installed_gems, gem_dir+"/cache"
+- end
+- unless gems.empty?
+- skipped.default = "not found in bundled_gems"
+- puts "skipped bundled gems:"
+- gems.each do |gem|
+- printf " %-32s%s\n", File.basename(gem), skipped[gem]
+- end
+- end
+-end
+-
+ parse_args()
+
+ include FileUtils
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 15:38:07 +0000