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 77969096b7b5..000000000000 --- 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 e6cfeac595a1..6acf6e65a87c 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 a42722e39898..4d6ebf8e289c 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 e48cfe3c44ad..25789a533f79 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 ef0156071fbf..7e03aa8fe7ee 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 a0ce3632f784..a29cd926baff 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 319395dadb37..be90e1015288 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 7bb9068bad27..6e93eccf210f 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 4a4a0661fa38..8e72eace0760 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 2c38a66330ab..e859c1cc1346 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 daf2e755fcd5..b629b93b3019 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 60f7d57a6a7b..7b51e9c3d2f3 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",