diff --git a/configs/components/_base-ruby.rb b/configs/components/_base-ruby.rb
index a72cb19f..5d8adabf 100644
--- a/configs/components/_base-ruby.rb
+++ b/configs/components/_base-ruby.rb
@@ -16,28 +16,7 @@
 # ENVIRONMENT
 #############
 
-if platform.is_aix?
-  pkg.environment 'CC', '/opt/freeware/bin/gcc'
-  pkg.environment 'LDFLAGS', "#{settings[:ldflags]} -Wl,-bmaxdata:0x80000000"
-elsif platform.is_solaris?
-  if !platform.is_cross_compiled? && platform.architecture == 'sparc'
-    pkg.environment 'PATH',
-                    "#{settings[:bindir]}:/opt/pl-build-tools/bin:/opt/csw/bin:/usr/ccs/bin:/usr/sfw/bin:$(PATH)"
-    pkg.environment 'CC', "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-gcc"
-  else
-    pkg.environment 'PATH', "#{settings[:bindir]}:/opt/csw/bin:/usr/ccs/bin:/usr/sfw/bin:$(PATH)"
-    pkg.environment 'CC', '/opt/csw/bin/gcc'
-    pkg.environment 'LD', '/opt/csw/bin/gld'
-    pkg.environment 'AR', '/opt/csw/bin/gar'
-  end
-  pkg.environment 'CXX', "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-g++"
-  pkg.environment 'LDFLAGS', "-Wl,-rpath=#{settings[:libdir]}"
-  if platform.os_version == '10'
-    # ./configure uses /bin/sh as the default shell when running config.sub on Solaris 10;
-    # This doesn't work and halts the configure process. Set CONFIG_SHELL to force use of bash:
-    pkg.environment 'CONFIG_SHELL', '/bin/bash'
-  end
-elsif platform.is_cross_compiled_linux?
+if platform.is_cross_compiled_linux?
   pkg.environment 'PATH', "#{settings[:bindir]}:$(PATH)"
   pkg.environment 'CC', "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-gcc"
   pkg.environment 'CXX', "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-g++"
@@ -66,15 +45,7 @@
 
 pkg.build_requires "openssl-#{settings[:openssl_version]}"
 
-if platform.is_aix?
-  pkg.build_requires "runtime-#{settings[:runtime_project]}"
-  pkg.build_requires 'readline'
-elsif platform.is_solaris?
-  pkg.build_requires "runtime-#{settings[:runtime_project]}"
-  pkg.build_requires 'libedit' if platform.name =~ /^solaris-10-sparc/
-elsif platform.is_cross_compiled_linux?
-  pkg.build_requires "runtime-#{settings[:runtime_project]}"
-end
+pkg.build_requires "runtime-#{settings[:runtime_project]}" if platform.is_cross_compiled_linux?
 
 #######
 # BUILD
diff --git a/configs/components/augeas.rb b/configs/components/augeas.rb
index f6641080..920b67c2 100644
--- a/configs/components/augeas.rb
+++ b/configs/components/augeas.rb
@@ -13,16 +13,6 @@
     pkg.build_requires 'ruby-selinux'
   end
 
-  if platform.name =~ /solaris-10-sparc/
-    # This patch to gnulib fixes a linking error around symbol versioning in pthread.
-    pkg.add_source "file://resources/patches/augeas/augeas-#{version}-gnulib-pthread-in-use.patch"
-    pkg.configure do
-      # gnulib is a submodule, and its files don't exist until after configure,
-      # so we apply the patch manually here instead of using pkg.apply_patch.
-      ["/usr/bin/gpatch -p0 < ../augeas-#{version}-gnulib-pthread-in-use.patch"]
-    end
-  end
-
   if platform.is_macos?
     pkg.build_requires 'readline'
     pkg.build_requires 'autoconf'
@@ -30,8 +20,6 @@
     pkg.build_requires 'libtool'
   end
 
-  extra_config_flags = platform.name =~ /solaris-11|aix/ ? ' --disable-dependency-tracking' : ''
-
   pkg.mirror "#{settings[:buildsources_url]}/augeas-#{pkg.get_version}.tar.gz"
 
   pkg.build_requires 'libxml2'
@@ -39,17 +27,7 @@
   # Ensure we're building against our own libraries when present
   pkg.environment 'PKG_CONFIG_PATH', "#{settings[:libdir]}/pkgconfig"
 
-  if platform.is_aix?
-    pkg.environment 'CC', '/opt/freeware/bin/gcc'
-    pkg.environment 'PATH', "/opt/freeware/bin:$(PATH):#{settings[:bindir]}"
-    pkg.build_requires "runtime-#{settings[:runtime_project]}"
-    pkg.build_requires 'readline'
-
-    pkg.environment 'LDFLAGS', settings[:ldflags]
-    pkg.environment 'CFLAGS', "-I#{settings[:includedir]}"
-  end
-
-  if platform.is_rpm? && !platform.is_aix?
+  if platform.is_rpm?
     if platform.architecture =~ /aarch64|ppc64|ppc64le/
       pkg.build_requires "runtime-#{settings[:runtime_project]}"
       pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
@@ -64,24 +42,6 @@
       pkg.environment 'CFLAGS', settings[:cflags]
       pkg.environment 'LDFLAGS', settings[:ldflags]
     end
-
-  elsif platform.is_solaris?
-    pkg.environment 'PATH',
-                    "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
-    pkg.environment 'CFLAGS', settings[:cflags]
-    pkg.environment 'LDFLAGS', settings[:ldflags]
-    pkg.build_requires 'libedit'
-    pkg.build_requires "runtime-#{settings[:runtime_project]}"
-    if platform.os_version == '10'
-      pkg.environment 'PKG_CONFIG_PATH', '/opt/csw/lib/pkgconfig'
-      pkg.environment 'PKG_CONFIG', '/opt/csw/bin/pkg-config'
-    elsif !platform.is_cross_compiled? && platform.architecture == 'sparc'
-      pkg.environment 'PKG_CONFIG_PATH', "#{settings[:libdir]}/pkgconfig"
-      pkg.environment 'PKG_CONFIG', '/usr/bin/pkg-config'
-    else
-      pkg.environment 'PKG_CONFIG_PATH', '/usr/lib/pkgconfig'
-      pkg.environment 'PKG_CONFIG', '/opt/pl-build-tools/bin/pkg-config'
-    end
   elsif platform.is_macos?
     pkg.environment 'PATH', '$(PATH):/opt/homebrew/bin:/usr/local/bin'
     pkg.environment 'CFLAGS', settings[:cflags]
@@ -108,7 +68,7 @@
   end
 
   pkg.configure do
-    ["./configure #{extra_config_flags} --prefix=#{settings[:prefix]} #{settings[:host]}"]
+    ["./configure --prefix=#{settings[:prefix]} #{settings[:host]}"]
   end
 
   pkg.build do
diff --git a/configs/components/curl.rb b/configs/components/curl.rb
index bd1542d0..bbc06142 100644
--- a/configs/components/curl.rb
+++ b/configs/components/curl.rb
@@ -19,11 +19,6 @@
     pkg.environment 'PATH', "$(shell cygpath -u #{settings[:gcc_bindir]}):$(PATH)"
     pkg.environment 'NM', '/usr/bin/nm' if platform.name =~ /windowsfips-2016/
     pkg.environment 'CYGWIN', settings[:cygwin]
-  elsif platform.is_aix?
-    pkg.environment 'PKG_CONFIG_PATH', '/opt/puppetlabs/puppet/lib/pkgconfig'
-    pkg.environment 'PATH', "/opt/freeware/bin:$(PATH):#{settings[:bindir]}"
-    # exclude -Wl,-brtl
-    ldflags = "-L#{settings[:libdir]}"
   else
     pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
   end
@@ -35,11 +30,6 @@
   # that curl's ntlm module depends on (md4 & des).
   configure_options << '--disable-ntlm' if !settings[:use_legacy_openssl_algos] && settings[:openssl_version] =~ /^3\./
 
-  if (platform.is_solaris? && platform.os_version == '11') || platform.is_aix?
-    # Makefile generation with automatic dependency tracking fails on these platforms
-    configure_options << '--disable-dependency-tracking'
-  end
-
   if platform.is_macos?
     pkg.environment 'MACOSX_DEPLOYMENT_TARGET', settings[:deployment_target]
     pkg.environment 'CFLAGS', settings[:cflags]
diff --git a/configs/components/libedit.rb b/configs/components/libedit.rb
index 904ae1e8..38da8f2f 100644
--- a/configs/components/libedit.rb
+++ b/configs/components/libedit.rb
@@ -11,13 +11,6 @@
 
   pkg.environment 'PATH', '/opt/pl-build-tools/bin:$(PATH)'
 
-  if platform.is_solaris?
-    pkg.environment 'CC', "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-gcc"
-  elsif platform.is_aix?
-    pkg.environment 'CC', '/opt/pl-build-tools/bin/gcc'
-    pkg.environment 'LDFLAGS', settings[:ldflags]
-  end
-
   pkg.environment 'CFLAGS', settings[:cflags] if platform.is_macos?
 
   pkg.configure do
diff --git a/configs/components/libffi.rb b/configs/components/libffi.rb
index f0470f45..a88349fb 100644
--- a/configs/components/libffi.rb
+++ b/configs/components/libffi.rb
@@ -5,24 +5,10 @@
   pkg.load_from_json('configs/components/libffi.json')
   pkg.mirror "#{settings[:buildsources_url]}/#{pkg.get_name}-#{pkg.get_version}.tar.gz"
 
-  if platform.is_aix?
-    pkg.environment 'PATH', '/opt/freeware/bin:$(PATH)'
-  elsif platform.is_cross_compiled_linux?
+  if platform.is_cross_compiled_linux?
     pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
     pkg.environment 'CFLAGS', settings[:cflags]
     pkg.environment 'LDFLAGS', settings[:ldflags]
-  elsif platform.is_solaris?
-    pkg.environment 'PATH',
-                    "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
-    if !platform.is_cross_compiled? && platform.architecture == 'sparc'
-      # must use gnu99 due to `asm` keyword
-      # https://gcc.gnu.org/onlinedocs/gcc-7.2.0/gcc/Extended-Asm.html
-      pkg.environment 'CFLAGS', "#{settings[:cflags]} -std=gnu99"
-    else
-      pkg.environment 'CFLAGS', "#{settings[:cflags]} -std=c99"
-    end
-    pkg.environment 'LDFLAGS', settings[:ldflags]
-    pkg.environment 'MAKE', 'gmake'
   elsif platform.is_macos?
     pkg.environment 'LDFLAGS', settings[:ldflags]
     pkg.environment 'CFLAGS', settings[:cflags]
diff --git a/configs/components/libxml2.rb b/configs/components/libxml2.rb
index 23ff0dbd..95091145 100644
--- a/configs/components/libxml2.rb
+++ b/configs/components/libxml2.rb
@@ -7,17 +7,10 @@
   pkg.load_from_json('configs/components/libxml2.json')
   pkg.mirror "#{settings[:buildsources_url]}/libxml2-#{pkg.get_version}.tar.xz"
 
-  if platform.is_aix?
-    pkg.environment 'PATH', '/opt/freeware/bin:$(PATH)'
-  elsif platform.is_cross_compiled_linux?
+  if platform.is_cross_compiled_linux?
     pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
     pkg.environment 'CFLAGS', settings[:cflags]
     pkg.environment 'LDFLAGS', settings[:ldflags]
-  elsif platform.is_solaris?
-    pkg.environment 'PATH',
-                    "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin:#{settings[:bindir]}"
-    pkg.environment 'CFLAGS', "#{settings[:cflags]} -std=c99"
-    pkg.environment 'LDFLAGS', settings[:ldflags]
   elsif platform.is_macos?
     pkg.environment 'LDFLAGS', settings[:ldflags]
     pkg.environment 'CFLAGS', settings[:cflags]
diff --git a/configs/components/libyaml.rb b/configs/components/libyaml.rb
index 7423d4bf..d2acfe9f 100644
--- a/configs/components/libyaml.rb
+++ b/configs/components/libyaml.rb
@@ -5,17 +5,10 @@
   pkg.load_from_json('configs/components/libyaml.json')
   pkg.mirror "#{settings[:buildsources_url]}/yaml-#{pkg.get_version}.tar.gz"
 
-  if platform.is_aix?
-    pkg.environment 'PATH', '/opt/freeware/bin:$(PATH)'
-  elsif platform.is_cross_compiled_linux?
+  if platform.is_cross_compiled_linux?
     pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
     pkg.environment 'CFLAGS', settings[:cflags]
     pkg.environment 'LDFLAGS', settings[:ldflags]
-  elsif platform.is_solaris?
-    pkg.environment 'PATH',
-                    "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
-    pkg.environment 'CFLAGS', "#{settings[:cflags]} -std=c99"
-    pkg.environment 'LDFLAGS', settings[:ldflags]
   elsif platform.is_macos?
     pkg.environment 'LDFLAGS', settings[:ldflags]
     pkg.environment 'CFLAGS', settings[:cflags]
diff --git a/configs/components/openssl-3.0.rb b/configs/components/openssl-3.0.rb
index 6d050523..38a4949b 100644
--- a/configs/components/openssl-3.0.rb
+++ b/configs/components/openssl-3.0.rb
@@ -15,8 +15,6 @@
 
   if platform.name =~ /^(amazon-|el-|redhat-|redhatfips-|fedora-)/
     pkg.build_requires 'perl-core'
-  elsif platform.is_solaris?
-    # perl is installed in platform definition
   else
     pkg.build_requires 'perl'
   end
@@ -31,27 +29,6 @@
     pkg.environment 'MAKE', platform[:make]
 
     target = platform.architecture == 'x64' ? 'mingw64' : 'mingw'
-  elsif platform.is_aix?
-    # REMIND: why not PATH?
-    pkg.environment 'CC', '/opt/freeware/bin/gcc'
-
-    cflags = "#{settings[:cflags]} -static-libgcc"
-    # see https://github.com/openssl/openssl/issues/18007 about -latomic
-    # see https://www.ibm.com/docs/en/aix/7.2?topic=l-ld-command about -R<path>, which is equivalent to -rpath
-    ldflags = "#{settings[:ldflags]} -Wl,-R#{settings[:libdir]} -latomic -lm"
-    target = 'aix-gcc'
-  elsif platform.is_solaris?
-    pkg.environment 'PATH', '/opt/csw/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin'
-    if !platform.is_cross_compiled? && platform.architecture == 'sparc'
-      pkg.environment 'CC', '/opt/pl-build-tools/bin/gcc'
-      gcc_lib = "/opt/pl-build-tools/#{settings[:platform_triple]}/lib"
-    else
-      pkg.environment 'CC', '/opt/csw/bin/gcc'
-      gcc_lib = "/opt/csw/#{settings[:platform_triple]}/lib"
-    end
-    cflags = "#{settings[:cflags]} -fPIC"
-    ldflags = "-R#{gcc_lib} -Wl,-rpath=#{settings[:libdir]} -L#{gcc_lib}"
-    target = platform.architecture =~ /86/ ? 'solaris-x86-gcc' : 'solaris-sparcv9-gcc'
   elsif platform.is_macos?
     pkg.environment 'PATH', '$(PATH):/opt/homebrew/bin:/usr/local/bin'
     pkg.environment 'CFLAGS', settings[:cflags]
@@ -129,14 +106,12 @@
 
   # Individual projects may provide their own openssl configure flags:
   project_flags = settings[:openssl_extra_configure_flags] || []
-  perl_exec = ''
-  perl_exec = '/opt/freeware/bin/perl' if platform.is_aix?
   configure_flags << project_flags
 
   pkg.environment 'CFLAGS', cflags
   pkg.environment 'LDFLAGS', ldflags
   pkg.configure do
-    ["#{perl_exec} ./Configure #{configure_flags.join(' ')}"]
+    ["./Configure #{configure_flags.join(' ')}"]
   end
 
   #######
@@ -170,11 +145,6 @@
   install_prefix = platform.is_windows? ? '' : 'INSTALL_PREFIX=/'
   install_commands = []
 
-  if platform.is_aix?
-    # "Removes any currently unused modules in kernel and library memory."
-    install_commands << 'slibclean'
-  end
-
   # Skip man and html docs
   install_commands << "#{platform[:make]} #{install_prefix} install_sw install_ssldirs"
   install_commands << "rm -f #{settings[:prefix]}/bin/c_rehash"
diff --git a/configs/components/readline.rb b/configs/components/readline.rb
index 776decae..7c2f39c2 100644
--- a/configs/components/readline.rb
+++ b/configs/components/readline.rb
@@ -10,17 +10,10 @@
   pkg.load_from_json('configs/components/readline.json')
   pkg.mirror "#{settings[:buildsources_url]}/#{pkg.get_name}-#{pkg.get_version}.tar.gz"
 
-  if platform.is_aix?
-    pkg.environment 'PATH', '/opt/freeware/bin:$(PATH)'
-  elsif platform.is_cross_compiled_linux?
+  if platform.is_cross_compiled_linux?
     pkg.environment 'PATH', "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
     pkg.environment 'CFLAGS', settings[:cflags]
     pkg.environment 'LDFLAGS', settings[:ldflags]
-  elsif platform.is_solaris?
-    pkg.environment 'PATH',
-                    "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
-    pkg.environment 'CFLAGS', "#{settings[:cflags]} -std=c99"
-    pkg.environment 'LDFLAGS', settings[:ldflags]
   elsif platform.is_macos?
     pkg.environment 'LDFLAGS', settings[:ldflags]
     pkg.environment 'CFLAGS', settings[:cflags]
diff --git a/configs/components/ruby-3.2.rb b/configs/components/ruby-3.2.rb
index 569d2049..3f13cbb8 100644
--- a/configs/components/ruby-3.2.rb
+++ b/configs/components/ruby-3.2.rb
@@ -26,8 +26,6 @@
 
   pkg.apply_patch "#{base}/rbinstall_gem_path.patch" if platform.is_cross_compiled?
 
-  pkg.apply_patch "#{base}/reline_disable_terminfo.patch" if platform.is_aix?
-
   if platform.is_windows?
     pkg.apply_patch "#{base}/windows_mingw32_mkmf.patch"
     pkg.apply_patch "#{base}/ruby-faster-load_32.patch"
@@ -214,8 +212,7 @@
   # then the CC override allows us to build ffi_c.so for ARM as well. The
   # "host" ruby is configured in _shared-agent-settings
   rbconfig_changes = {}
-  if platform.is_cross_compiled? || (platform.is_solaris? && platform.architecture != 'sparc')
-    # REMIND: why are we overriding rbconfig for solaris intel?
+  if platform.is_cross_compiled?
     rbconfig_changes['CC'] = 'gcc'
     rbconfig_changes['warnflags'] =
       '-Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wno-tautological-compare -Wno-parentheses-equality -Wno-constant-logical-operand -Wno-self-assign -Wunused-variable -Wimplicit-int -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration -Wdeprecated-declarations -Wno-packed-bitfield-compat -Wsuggest-attribute=noreturn -Wsuggest-attribute=format -Wno-maybe-uninitialized'
diff --git a/configs/components/ruby-augeas.rb b/configs/components/ruby-augeas.rb
index 697852bf..f0ea6176 100644
--- a/configs/components/ruby-augeas.rb
+++ b/configs/components/ruby-augeas.rb
@@ -11,25 +11,7 @@
   pkg.environment 'CONFIGURE_ARGS', '--vendor'
   pkg.environment 'PKG_CONFIG_PATH', "#{File.join(settings[:libdir], 'pkgconfig')}:/usr/lib/pkgconfig"
 
-  if platform.is_aix?
-    pkg.environment 'CC', '/opt/freeware/bin/gcc'
-    pkg.environment 'PATH', '$(PATH):/opt/freeware/bin'
-    pkg.environment 'RUBY', settings[:host_ruby]
-    pkg.environment 'LDFLAGS', " -brtl #{settings[:ldflags]}"
-  end
-
-  if platform.is_solaris?
-    pkg.environment 'RUBY', settings[:host_ruby] if platform.is_cross_compiled?
-
-    ruby = if !platform.is_cross_compiled? && platform.architecture == 'sparc'
-             File.join(settings[:ruby_bindir], 'ruby')
-           else
-             # This should really only be done when cross compiling but
-             # to avoid breaking solaris x86_64 in 7.x continue preloading
-             # our hook.
-             "#{settings[:host_ruby]} -r#{settings[:datadir]}/doc/rbconfig-#{settings[:ruby_version]}-orig.rb"
-           end
-  elsif platform.is_cross_compiled? && (platform.is_linux? || platform.is_macos?)
+  if platform.is_cross_compiled? && (platform.is_linux? || platform.is_macos?)
     pkg.environment 'RUBY', settings[:host_ruby]
     ruby = "#{settings[:host_ruby]} -r#{settings[:datadir]}/doc/rbconfig-#{settings[:ruby_version]}-orig.rb"
     pkg.environment 'LDFLAGS', settings[:ldflags]
@@ -83,7 +65,7 @@
     ]
   end
 
-  if platform.is_solaris? || platform.is_cross_compiled_linux?
+  if platform.is_cross_compiled_linux?
     pkg.install do
       "chown root:root #{augeas_rb_target}"
     end
diff --git a/configs/components/ruby-shadow.rb b/configs/components/ruby-shadow.rb
index eaa5c0ad..18b640b8 100644
--- a/configs/components/ruby-shadow.rb
+++ b/configs/components/ruby-shadow.rb
@@ -15,18 +15,7 @@
 
   pkg.environment 'CONFIGURE_ARGS', '--vendor'
 
-  if platform.is_solaris?
-    pkg.environment 'RUBY', settings[:host_ruby] if platform.is_cross_compiled?
-
-    ruby = if !platform.is_cross_compiled? && platform.architecture == 'sparc'
-             File.join(settings[:ruby_bindir], 'ruby')
-           else
-             # This should really only be done when cross compiling but
-             # to avoid breaking solaris x86_64 in 7.x continue preloading
-             # our hook.
-             "#{settings[:host_ruby]} -r#{settings[:datadir]}/doc/rbconfig-#{settings[:ruby_version]}-orig.rb"
-           end
-  elsif platform.is_cross_compiled?
+  if platform.is_cross_compiled?
     pkg.environment 'RUBY', settings[:host_ruby]
     ruby = "#{settings[:host_ruby]} -r#{settings[:datadir]}/doc/rbconfig-#{settings[:ruby_version]}-orig.rb"
   else
diff --git a/configs/components/rubygem-ffi.rb b/configs/components/rubygem-ffi.rb
index ca126ac7..b8d18b77 100644
--- a/configs/components/rubygem-ffi.rb
+++ b/configs/components/rubygem-ffi.rb
@@ -26,63 +26,12 @@
   settings["#{pkg.get_name}_gem_install_options".to_sym] = '-- --enable-system-libffi'
   instance_eval File.read('configs/components/_base-rubygem.rb')
 
-  # due to contrib/make_sunver.pl missing on solaris 11 we cannot compile libffi, so we provide the opencsw library
-  if platform.name =~ /solaris-11/ && (platform.is_cross_compiled? || platform.architecture != 'sparc')
-    pkg.environment 'CPATH',
-                    '/opt/csw/lib/libffi-3.2.1/include'
-  end
-  pkg.environment 'MAKE', platform[:make] if platform.is_solaris?
-
-  if platform.is_solaris?
-    if !platform.is_cross_compiled? && platform.architecture == 'sparc'
-      pkg.environment 'PATH', "#{settings[:ruby_bindir]}:$(PATH)"
-    else
-      pkg.environment 'PATH', '/opt/csw/bin:$(PATH)'
-    end
-  elsif platform.is_aix?
-    pkg.environment 'PATH', '/opt/freeware/bin:$(PATH)'
-  end
-
-  pkg.install_file '/opt/csw/lib/libffi.so.6', "#{settings[:libdir]}/libffi.so.6" if platform.name =~ /solaris-10-i386/
-
   pkg.environment 'PKG_CONFIG_PATH', '/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_PATH)'
 
   if platform.is_cross_compiled? && !platform.is_macos?
-    base_ruby = case platform.name
-                when /solaris-10/
-                  '/opt/csw/lib/ruby/2.0.0'
-                else
-                  # Change this someday if we ever end up cross compiling OpenVox on Linux
-                  # as we won't be using pl-build-tools there
-                  '/opt/pl-build-tools/lib/ruby/2.1.0'
-                end
-
-    # force compilation without system libffi in order to have a statically linked ffi_c.so
-    if platform.name =~ /solaris-11-sparc/
-      sed_exp = 's|CONFIG\["LDFLAGS"\].*|CONFIG["LDFLAGS"] = "-Wl,-rpath-link,/opt/pl-build-tools/sparc-sun-solaris2.11/sysroot/lib:/opt/pl-build-tools/sparc-sun-solaris2.11/sysroot/usr/lib -L. -Wl,-rpath=/opt/puppetlabs/puppet/lib -fstack-protector"|'
-
-      pkg.configure do
-        [
-          # libtool always uses the system/solaris ld even if we
-          # configure it to use the GNU ld, causing some flag
-          # mismatches, so just temporarily move the system ld
-          # somewhere else
-          %(mv /usr/bin/ld /usr/bin/ld1),
-          %(#{platform[:sed]} -i '#{sed_exp}' /opt/puppetlabs/puppet/share/doc/rbconfig-#{settings[:ruby_version]}-orig.rb)
-        ]
-      end
-
-      # move ld back after the gem is installed
-      pkg.install { 'mv /usr/bin/ld1 /usr/bin/ld' }
-
-    elsif platform.name =~ /solaris-10-sparc/
-      sed_exp = 's|CONFIG\["LDFLAGS"\].*|CONFIG["LDFLAGS"] = "-Wl,-rpath-link,/opt/pl-build-tools/sparc-sun-solaris2.10/sysroot/lib:/opt/pl-build-tools/sparc-sun-solaris2.10/sysroot/usr/lib -L. -Wl,-rpath=/opt/puppetlabs/puppet/lib -fstack-protector"|'
-      pkg.configure do
-        [
-          %(#{platform[:sed]} -i '#{sed_exp}' /opt/puppetlabs/puppet/share/doc/rbconfig-#{settings[:ruby_version]}-orig.rb)
-        ]
-      end
-    end
+    # Change this someday if we ever end up cross compiling OpenVox on Linux
+    # as we won't be using pl-build-tools there
+    base_ruby = '/opt/pl-build-tools/lib/ruby/2.1.0'
 
     # FFI 1.13.1 forced the minimum required ruby version to ~> 2.3
     # In order to be able to install the gem using pl-ruby(2.1.9)
diff --git a/configs/projects/_shared-agent-settings.rb b/configs/projects/_shared-agent-settings.rb
index 96e4cc47..60c1769a 100644
--- a/configs/projects/_shared-agent-settings.rb
+++ b/configs/projects/_shared-agent-settings.rb
@@ -103,14 +103,9 @@
 if platform.is_windows?
   proj.setting(:host_ruby, File.join(proj.ruby_bindir, 'ruby.exe'))
   proj.setting(:host_gem, File.join(proj.ruby_bindir, 'gem.bat'))
-elsif platform.is_cross_compiled? && (platform.is_linux? || platform.is_solaris?)
-  if platform.name =~ /solaris-10-sparc/
-    proj.setting(:host_ruby, '/opt/csw/bin/ruby')
-    proj.setting(:host_gem, '/opt/csw/bin/gem2.0')
-  else
-    proj.setting(:host_ruby, '/opt/pl-build-tools/bin/ruby')
-    proj.setting(:host_gem, '/opt/pl-build-tools/bin/gem')
-  end
+elsif platform.is_cross_compiled? && platform.is_linux?
+  proj.setting(:host_ruby, '/opt/pl-build-tools/bin/ruby')
+  proj.setting(:host_gem, '/opt/pl-build-tools/bin/gem')
 elsif platform.is_cross_compiled? && platform.is_macos?
   proj.setting(:host_ruby, "/usr/local/opt/ruby@#{ruby_version_y}/bin/ruby")
   proj.setting(:host_gem, "/usr/local/opt/ruby@#{ruby_version_y}/bin/gem")
@@ -123,13 +118,6 @@
   host = "--host #{platform_triple}"
 elsif platform.is_cross_compiled? && platform.is_macos?
   host = '--host aarch64-apple-darwin --build x86_64-apple-darwin --target aarch64-apple-darwin'
-elsif platform.is_solaris?
-  if platform.architecture == 'i386'
-    platform_triple = "#{platform.architecture}-pc-solaris2.#{platform.os_version}"
-  else
-    platform_triple = "#{platform.architecture}-sun-solaris2.#{platform.os_version}"
-    host = "--host #{platform_triple}"
-  end
 elsif platform.is_windows?
   # For windows, we need to ensure we are building for mingw not cygwin
   platform_triple = platform.platform_triple
@@ -139,9 +127,6 @@
 proj.setting(:gem_install, "#{proj.host_gem} install --no-rdoc --no-ri --local ")
 proj.setting(:gem_uninstall, "#{proj.host_gem} uninstall --all --ignore-dependencies ")
 
-# For AIX, we use the triple to install a better rbconfig
-platform_triple = "powerpc-ibm-aix#{platform.os_version}.0.0" if platform.is_aix?
-
 proj.setting(:platform_triple, platform_triple)
 proj.setting(:host, host)
 
@@ -184,13 +169,7 @@
   proj.setting(:ldflags, "-L#{proj.libdir}")
 end
 
-proj.setting(:ldflags, "-Wl,-brtl -L#{proj.libdir}") if platform.is_aix?
-
-if platform.is_solaris?
-  proj.identifier 'voxpupuli.org'
-elsif platform.is_macos?
-  proj.identifier 'org.voxpupuli'
-end
+proj.identifier 'org.voxpupuli' if platform.is_macos?
 
 proj.timeout 7200 if platform.is_windows?
 
diff --git a/configs/projects/agent-runtime-8.x.rb b/configs/projects/agent-runtime-8.x.rb
index 2f3e370a..eade839c 100644
--- a/configs/projects/agent-runtime-8.x.rb
+++ b/configs/projects/agent-runtime-8.x.rb
@@ -80,7 +80,7 @@
     proj.component 'rubygem-CFPropertyList'
   end
 
-  unless platform.is_aix? || platform.is_windows?
+  unless platform.is_windows?
     proj.component 'ruby-shadow'
   end
 
@@ -89,16 +89,11 @@
     proj.component 'ruby-selinux'
   end
 
-  # libedit is used instead of readline on these platforms
-  if platform.is_solaris?
-    proj.component 'libedit'
-  end
-
   if platform.is_cross_compiled?
     proj.component 'pl-ruby-patch'
   end
 
-  if platform.is_windows? || platform.is_solaris? || platform.is_aix?
+  if platform.is_windows?
     proj.component 'rubygem-minitar'
   end
 
diff --git a/configs/projects/agent-runtime-main.rb b/configs/projects/agent-runtime-main.rb
index f9a254cc..e8be5c38 100644
--- a/configs/projects/agent-runtime-main.rb
+++ b/configs/projects/agent-runtime-main.rb
@@ -80,7 +80,7 @@
     proj.component 'rubygem-CFPropertyList'
   end
 
-  unless platform.is_aix? || platform.is_windows?
+  unless platform.is_windows?
     proj.component 'ruby-shadow'
   end
 
@@ -89,16 +89,11 @@
     proj.component 'ruby-selinux'
   end
 
-  # libedit is used instead of readline on these platforms
-  if platform.is_solaris?
-    proj.component 'libedit'
-  end
-
   if platform.is_cross_compiled?
     proj.component 'pl-ruby-patch'
   end
 
-  if platform.is_windows? || platform.is_solaris? || platform.is_aix?
+  if platform.is_windows?
     proj.component 'rubygem-minitar'
   end
 
diff --git a/resources/patches/ruby_32/reline_disable_terminfo.patch b/resources/patches/ruby_32/reline_disable_terminfo.patch
deleted file mode 100644
index 48688770..00000000
--- a/resources/patches/ruby_32/reline_disable_terminfo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit e0e58e7f5ee53e14f7a87a7399ad977a1381861a
-Author: Josh Cooper <joshcooper@users.noreply.github.com>
-Date:   Mon Jul 10 22:34:25 2023 -0700
-
-    Disable terminfo
-    
-    If curses libraries can be loaded but terminfo isn't installed, then
-    reline raises, killing irb. Apply this patch to disable terminfo
-    integration.
-
-diff --git a/lib/reline/terminfo.rb b/lib/reline/terminfo.rb
-index f53642b919..e0633f802b 100644
---- a/lib/reline/terminfo.rb
-+++ b/lib/reline/terminfo.rb
-@@ -163,7 +163,7 @@ def self.tigetnum(capname)
-   end
- 
-   def self.enabled?
--    true
-+    false
-   end
- end if Reline::Terminfo.curses_dl
-