From cab83ef5b059b0423e8ea8b5e3b339d58629f621 Mon Sep 17 00:00:00 2001 From: John McCrae Date: Mon, 1 Apr 2024 16:22:10 -0700 Subject: [PATCH] Updating env vars for macos build failures Signed-off-by: John McCrae --- config/software/ruby.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/software/ruby.rb b/config/software/ruby.rb index d72a8ca36..66081451c 100644 --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -91,7 +91,7 @@ # 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). - brew install openssl@3 readline libyaml gmp + 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" @@ -288,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