Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating env vars for macos build failures #1885

Closed
wants to merge 3 commits into from
Closed

Updating env vars for macos build failures #1885

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd540e3
Updating env vars for macos build failures
johnmccrae Apr 1, 2024
2dd02a1
Updating env vars for macos build failures
johnmccrae Apr 1, 2024
cab83ef
Updating env vars for macos build failures
johnmccrae Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion config/software/ruby.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@
# link to anything in a path given with -Lextra-libs. Normally these
# would be harmless, except that autoconf treats any output to stderr as
# a failure when it makes a test program to check your CFLAGS (regardless
# of the actual exit code from the compiler).
# of the actual exit code from the compiler).
brew install openssl@3
export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$(brew --prefix openssl@3)"
arch = intel? ? "x86_64" : "arm64"
env["CFLAGS"] << " -I#{install_dir}/embedded/include/ncurses -arch #{arch} -m64 -O3 -g -pipe -Qunused-arguments"
env["LDFLAGS"] << " -arch #{arch}"
Expand Down Expand Up @@ -286,6 +288,9 @@
project.overrides[:openssl] &&
ChefUtils::VersionString.new(project.overrides[:openssl][:version]).satisfies?(">= 3.0")
configure_command << "--without-openssl --with-openssl-dir=#{install_dir}/embedded"
if RUBY_PLATFORM.include?("darwin")
configure_command << "--without-openssl --with-openssl-dir=$(brew --prefix openssl@3)"
end
end

# FFS: works around a bug that infects AIX when it picks up our pkg-config
Expand Down