[macOS] Replace pkg-config with pkgconf in all macOS images (#11015)

actions · Nov 22, 2024 · 26b592d · 26b592d
1 parent d22a5ec
commit 26b592d
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 37 deletions.
diff --git a/images/macos/scripts/build/install-pkg-config.sh b/images/macos/scripts/build/install-pkg-config.sh
diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -137,7 +137,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) {
 }
 $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion))
 $utilities.AddToolVersion("Packer", $(Get-PackerVersion))
-$utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion))
+$utilities.AddToolVersion("pkgconf", $(Get-PKGConfVersion))
 if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) {
     $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion))
     $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion))

diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1
@@ -605,9 +605,9 @@ function Get-ColimaVersion {
     return $colimaVersion
 }
 
-function Get-PKGConfigVersion {
-    $pkgconfigVersion = Run-Command "pkg-config --version"
-    return $pkgconfigVersion
+function Get-PKGConfVersion {
+    $pkgconfVersion = Run-Command "pkgconf --version"
+    return $pkgconfVersion
 }
 
 function Get-XcbeautifyVersion {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -72,6 +72,7 @@
             "p7zip",
             "packer",
             "perl",
+            "pkgconf",
             "swiftformat",
             "zstd",
             "gmp",