Skip to content

Commit

Permalink
Got it! have to adjust FIPS now, moving FIPS support back to the main…
Browse files Browse the repository at this point in the history
… openssl.rb file for v3 and laster in onnibus-software

Signed-off-by: John McCrae <[email protected]>
  • Loading branch information
johnmccrae committed Apr 23, 2024
1 parent 390cef6 commit 3f020a1
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions config/software/ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,12 @@

# Remove this if clause once Ruby < 3.1 is not supported in combination with
# OpenSSL >= 3.0
if version.satisfies?("< 3.1") &&
project.overrides[:openssl] &&
ChefUtils::VersionString.new(project.overrides[:openssl][:version]).satisfies?(">= 3.0")
configure_command << "--without-openssl --with-openssl-dir=#{install_dir}/embedded"
end
# if version.satisfies?("< 3.1") &&
# project.overrides[:openssl] &&
# ChefUtils::VersionString.new(project.overrides[:openssl][:version]).satisfies?(">= 3.0")
# # configure_command << "--without-openssl --with-openssl-dir=#{install_dir}/embedded"
# configure_command << "--without-openssl --with-openssl-dir=#{install_dir}/embedded"
# end

# FFS: works around a bug that infects AIX when it picks up our pkg-config
# AFAIK, ruby does not need or use this pkg-config it just causes the build to fail.
Expand Down

0 comments on commit 3f020a1

Please sign in to comment.