From ef8d7e93f5f92461da463674c1c3ee9face728c7 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Mon, 6 May 2024 19:05:40 -0700 Subject: [PATCH] Remove yaml-cpp from macOS provisioning In May 2018, commit fd8c9e41aa16fc4f79f1f7b230acbaf52157938e added yaml-cpp as a component to the agent-runtime-master project. In Oct 2018, commit bc865b3a4e4b9ab9c8de0d488a192da978db5e27 installed yaml-cpp using homebrew for agent 5.5.x on macOS 10.12. This means yaml-cpp headers are present in /usr/local/include and take precedence over our component. This drops yaml-cpp from brew install, which ensures we're compiling against the correct yaml-cpp headers in our component. --- configs/platforms/osx-11-arm64.rb | 2 +- configs/platforms/osx-11-x86_64.rb | 2 +- configs/platforms/osx-12-arm64.rb | 2 +- configs/platforms/osx-12-x86_64.rb | 2 +- configs/platforms/osx-13-arm64.rb | 2 +- configs/platforms/osx-13-x86_64.rb | 2 +- configs/platforms/osx-14-arm64.rb | 2 +- configs/platforms/osx-14-x86_64.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/platforms/osx-11-arm64.rb b/configs/platforms/osx-11-arm64.rb index 2d762df6b..47ddef4a1 100644 --- a/configs/platforms/osx-11-arm64.rb +++ b/configs/platforms/osx-11-arm64.rb @@ -1,7 +1,7 @@ platform 'osx-11-arm64' do |plat| plat.inherit_from_default - packages = %w[cmake pkg-config yaml-cpp] + packages = %w[cmake pkg-config] plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'" plat.output_dir File.join('apple', '11', 'PC1', 'arm64') diff --git a/configs/platforms/osx-11-x86_64.rb b/configs/platforms/osx-11-x86_64.rb index 28dd84273..e06c83328 100644 --- a/configs/platforms/osx-11-x86_64.rb +++ b/configs/platforms/osx-11-x86_64.rb @@ -1,7 +1,7 @@ platform 'osx-11-x86_64' do |plat| plat.inherit_from_default - packages = %w[cmake pkg-config yaml-cpp] + packages = %w[cmake pkg-config] plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'" plat.output_dir File.join('apple', '11', 'PC1', 'x86_64') diff --git a/configs/platforms/osx-12-arm64.rb b/configs/platforms/osx-12-arm64.rb index 1c1fbdc0a..2a83b3fa0 100644 --- a/configs/platforms/osx-12-arm64.rb +++ b/configs/platforms/osx-12-arm64.rb @@ -1,7 +1,7 @@ platform 'osx-12-arm64' do |plat| plat.inherit_from_default - packages = %w[automake cmake pkg-config yaml-cpp] + packages = %w[automake cmake pkg-config] plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'" plat.output_dir File.join('apple', '12', 'PC1', 'arm64') diff --git a/configs/platforms/osx-12-x86_64.rb b/configs/platforms/osx-12-x86_64.rb index 2b583907e..242e2fc5d 100644 --- a/configs/platforms/osx-12-x86_64.rb +++ b/configs/platforms/osx-12-x86_64.rb @@ -1,7 +1,7 @@ platform 'osx-12-x86_64' do |plat| plat.inherit_from_default - packages = %w[cmake pkg-config yaml-cpp] + packages = %w[cmake pkg-config] plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'" plat.output_dir File.join('apple', '12', 'PC1', 'x86_64') diff --git a/configs/platforms/osx-13-arm64.rb b/configs/platforms/osx-13-arm64.rb index c4b7f5a67..cb68172e9 100644 --- a/configs/platforms/osx-13-arm64.rb +++ b/configs/platforms/osx-13-arm64.rb @@ -1,7 +1,7 @@ platform 'osx-13-arm64' do |plat| plat.inherit_from_default - packages = %w[automake cmake pkg-config yaml-cpp] + packages = %w[automake cmake pkg-config] plat.provision_with "su test -c '/opt/homebrew/bin/brew install #{packages.join(' ')}'" plat.output_dir File.join('apple', '13', 'PC1', 'arm64') diff --git a/configs/platforms/osx-13-x86_64.rb b/configs/platforms/osx-13-x86_64.rb index 758509891..74e0aee11 100644 --- a/configs/platforms/osx-13-x86_64.rb +++ b/configs/platforms/osx-13-x86_64.rb @@ -1,7 +1,7 @@ platform 'osx-13-x86_64' do |plat| plat.inherit_from_default - packages = %w[cmake pkg-config yaml-cpp] + packages = %w[cmake pkg-config] plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'" plat.output_dir File.join('apple', '13', 'PC1', 'x86_64') diff --git a/configs/platforms/osx-14-arm64.rb b/configs/platforms/osx-14-arm64.rb index 5706d641d..3fb0bac3d 100644 --- a/configs/platforms/osx-14-arm64.rb +++ b/configs/platforms/osx-14-arm64.rb @@ -1,7 +1,7 @@ platform 'osx-14-arm64' do |plat| plat.inherit_from_default - packages = %w[automake cmake pkg-config yaml-cpp] + packages = %w[automake cmake pkg-config] plat.provision_with "su test -c '/opt/homebrew/bin/brew install #{packages.join(' ')}'" plat.output_dir File.join('apple', '14', 'PC1', 'arm64') diff --git a/configs/platforms/osx-14-x86_64.rb b/configs/platforms/osx-14-x86_64.rb index 2dd1bef9f..00d772dae 100644 --- a/configs/platforms/osx-14-x86_64.rb +++ b/configs/platforms/osx-14-x86_64.rb @@ -1,7 +1,7 @@ platform 'osx-14-x86_64' do |plat| plat.inherit_from_default - packages = %w[cmake pkg-config yaml-cpp] + packages = %w[cmake pkg-config] plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'" plat.output_dir File.join('apple', '14', 'PC1', 'x86_64')