From 032b010f1902c415621d3cb137efc52b54650829 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan Date: Wed, 20 Nov 2024 18:37:57 -0600 Subject: [PATCH] [macOS] Replace pkg-config with pkgconf in all macOS images --- images/macos/scripts/build/install-pkg-config.sh | 15 --------------- images/macos/scripts/tests/BasicTools.Tests.ps1 | 6 ++++++ images/macos/scripts/tests/Common.Tests.ps1 | 6 ------ images/macos/templates/macOS-13.anka.pkr.hcl | 3 +-- .../macos/templates/macOS-13.arm64.anka.pkr.hcl | 3 +-- images/macos/templates/macOS-14.anka.pkr.hcl | 3 +-- .../macos/templates/macOS-14.arm64.anka.pkr.hcl | 3 +-- images/macos/templates/macOS-15.anka.pkr.hcl | 3 +-- .../macos/templates/macOS-15.arm64.anka.pkr.hcl | 3 +-- images/macos/toolsets/toolset-13.json | 1 + images/macos/toolsets/toolset-14.json | 1 + images/macos/toolsets/toolset-15.json | 1 + 12 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 images/macos/scripts/build/install-pkg-config.sh diff --git a/images/macos/scripts/build/install-pkg-config.sh b/images/macos/scripts/build/install-pkg-config.sh deleted file mode 100644 index 77969096b7b5d..0000000000000 --- a/images/macos/scripts/build/install-pkg-config.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-pkg-config.sh -## Desc: Install pkg-config -################################################################################ - -source ~/utils/utils.sh - -echo "Installing pkg-config..." - -brew tap-new my-org/old-formulas -brew extract pkg-config my-org/old-formulas --version=0.29.2 -brew install my-org/old-formulas/pkg-config@0.29.2 - -invoke_tests "Common" "pkg-config" diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index e6cfeac595a11..6acf6e65a87c7 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -178,3 +178,9 @@ Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) "magick -version" | Should -ReturnZeroExitCode } } + +Describe "pkgconf" { + It "pkgconf" { + "pkgconf --version" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index a42722e398989..4d6ebf8e289c6 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -168,9 +168,3 @@ Describe "Unxip" { "unxip --version" | Should -ReturnZeroExitCode } } - -Describe "pkg-config" { - It "pkg-config" { - "pkg-config --version" | Should -ReturnZeroExitCode - } -} diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index e48cfe3c44ad8..25789a533f79f 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -218,8 +218,7 @@ build { "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-unxip.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-unxip.sh" ] } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index ef0156071fbfd..7e03aa8fe7ee3 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -220,8 +220,7 @@ build { "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-unxip.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-unxip.sh" ] } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index a0ce3632f7843..a29cd926baff6 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -217,8 +217,7 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-common-utils.sh" ] } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 319395dadb377..be90e10152883 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -219,8 +219,7 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-common-utils.sh" ] } diff --git a/images/macos/templates/macOS-15.anka.pkr.hcl b/images/macos/templates/macOS-15.anka.pkr.hcl index 7bb9068bad277..6e93eccf210ff 100644 --- a/images/macos/templates/macOS-15.anka.pkr.hcl +++ b/images/macos/templates/macOS-15.anka.pkr.hcl @@ -212,8 +212,7 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-common-utils.sh" ] } diff --git a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl index 4a4a0661fa388..8e72eace07608 100644 --- a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl @@ -214,8 +214,7 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-common-utils.sh" ] } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 2c38a66330abb..e859c1cc13460 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -77,6 +77,7 @@ "p7zip", "packer", "perl", + "pkgconf", "swiftformat", "tcl-tk@8", "zstd", diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index daf2e755fcd5b..b629b93b3019f 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -80,6 +80,7 @@ "p7zip", "packer", "perl", + "pkgconf", "swiftformat", "tcl-tk@8", "zstd", diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 60f7d57a6a7b6..7b51e9c3d2f33 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -72,6 +72,7 @@ "p7zip", "packer", "perl", + "pkgconf", "swiftformat", "zstd", "gmp",