Merge pull request #707 from cthorn42/maint/main/PA-5619_update_aix_p…

…atches Maint/main/pa 5619 update aix patches
puppetlabs · Jul 27, 2023 · 2db5815 · 2db5815
2 parents 594e420 + 53f77d6
commit 2db5815
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/configs/components/curl.rb b/configs/components/curl.rb
@@ -4,11 +4,6 @@
   pkg.url "https://curl.se/download/curl-#{pkg.get_version}.tar.gz"
   pkg.mirror "#{settings[:buildsources_url]}/curl-#{pkg.get_version}.tar.gz"
 
-  if platform.is_aix?
-    # Patch to disable _ALL_SOURCE when including select.h from multi.c. See patch for details.
-    pkg.apply_patch 'resources/patches/curl/curl-7.55.1-aix-poll.patch'
-  end
-
   pkg.build_requires "openssl-#{settings[:openssl_version]}"
   pkg.build_requires "puppet-ca-bundle"
 

diff --git a/configs/components/ruby-3.2.2.rb b/configs/components/ruby-3.2.2.rb
@@ -49,12 +49,6 @@
 
   if platform.is_aix?
     pkg.apply_patch "#{base}/reline_disable_terminfo.patch"
-    # TODO: Remove this patch once PA-1607 is resolved.
- #   pkg.apply_patch "#{base}/aix_configure.patch"
- #   pkg.apply_patch "#{base}/aix-fix-libpath-in-configure.patch"
- #   pkg.apply_patch "#{base}/aix-do-not-use-realpath.patch"
- #   pkg.apply_patch "#{base}/aix_ruby_2.1_fix_make_test_failure_r2.5.patch"
- #   pkg.apply_patch "#{base}/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch"
   end
 
   if platform.is_windows?