4 files changed, 87 insertions, 0 deletions
diff --git a/lang/ruby35/files/patch-common.mk b/lang/ruby35/files/patch-common.mk
new file mode 100644
index 000000000000..10e9abf6216c
--- /dev/null
+++ b/lang/ruby35/files/patch-common.mk
@@ -0,0 +1,26 @@
+--- common.mk.orig	2024-12-12 01:10:13 UTC
++++ common.mk
+@@ -487,17 +487,17 @@ install-all: pre-install-all do-install-all post-insta
+ $(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
+ 
+ install-all: pre-install-all do-install-all post-install-all
+-pre-install-all:: all pre-install-local pre-install-ext pre-install-gem pre-install-doc
++pre-install-all:: all pre-install-local pre-install-ext pre-install-doc
+ do-install-all: pre-install-all $(DOT_WAIT) docs
+-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all $(INSTALL_DOC_OPTS)
+-post-install-all:: post-install-local post-install-ext post-install-gem post-install-doc
++	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --exclude=gem $(INSTALL_DOC_OPTS)
++post-install-all:: post-install-local post-install-ext post-install-doc
+ 	@$(NULLCMD)
+ 
+ install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
+-pre-install-nodoc:: pre-install-local pre-install-ext pre-install-gem
++pre-install-nodoc:: pre-install-local pre-install-ext
+ do-install-nodoc: main pre-install-nodoc
+-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --exclude=doc
+-post-install-nodoc:: post-install-local post-install-ext post-install-gem
++	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --exclude=doc --exclude=gem
++post-install-nodoc:: post-install-local post-install-ext
+ 
+ install-local: pre-install-local do-install-local post-install-local
+ pre-install-local:: pre-install-bin pre-install-lib pre-install-man
diff --git a/lang/ruby35/files/patch-configure.ac b/lang/ruby35/files/patch-configure.ac
new file mode 100644
index 000000000000..2e3c608f9449
--- /dev/null
+++ b/lang/ruby35/files/patch-configure.ac
@@ -0,0 +1,36 @@
+--- configure.ac.orig	2024-12-12 01:10:13 UTC
++++ configure.ac
+@@ -1411,7 +1411,7 @@ AC_CHECK_HEADERS(stdatomic.h)
+ AC_CHECK_HEADERS(stdckdint.h)
+ AC_CHECK_HEADERS(stdatomic.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)
+@@ -3149,7 +3149,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'
+ 			])
+@@ -3611,6 +3611,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=''
+@@ -4443,6 +4444,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/ruby35/files/patch-lib_mkmf.rb b/lang/ruby35/files/patch-lib_mkmf.rb
new file mode 100644
index 000000000000..46ba529446e0
--- /dev/null
+++ b/lang/ruby35/files/patch-lib_mkmf.rb
@@ -0,0 +1,11 @@
+--- lib/mkmf.rb.orig	2024-05-16 04:54:44 UTC
++++ lib/mkmf.rb
+@@ -242,7 +242,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/ruby35/files/patch-tool_mkconfig.rb b/lang/ruby35/files/patch-tool_mkconfig.rb
new file mode 100644
index 000000000000..24478cacbb7a
--- /dev/null
+++ b/lang/ruby35/files/patch-tool_mkconfig.rb
@@ -0,0 +1,14 @@
+--- tool/mkconfig.rb.orig	2024-12-12 01:10:13 UTC
++++ tool/mkconfig.rb
+@@ -170,8 +170,9 @@ end
+   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 %[\