[MacOS] pkg-config -> pkgconf

Signed-off-by: Sora Morimoto <[email protected]>
actions · Nov 18, 2024 · a6cf6cd · a6cf6cd
1 parent 277110d
commit a6cf6cd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/...macos/scripts/build/install-pkg-config.sh → ...es/macos/scripts/build/install-pkgconf.sh b/...macos/scripts/build/install-pkg-config.sh → ...es/macos/scripts/build/install-pkgconf.sh
@@ -1,15 +1,15 @@
 #!/bin/bash -e -o pipefail
 ################################################################################
-##  File:  install-pkg-config.sh
-##  Desc:  Install pkg-config
+##  File:  install-pkgconf.sh
+##  Desc:  Install pkgconf
 ################################################################################
 
 source ~/utils/utils.sh
 
-echo "Installing pkg-config..."
+echo "Installing pkgconf..."
 
 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
+brew extract pkgconf my-org/old-formulas --version=0.29.2
+brew install my-org/old-formulas/pkgconf@0.29.2
 
-invoke_tests "Common" "pkg-config"
+invoke_tests "Common" "pkgconf"
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/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1
@@ -169,8 +169,8 @@ Describe "Unxip" {
     }
 }
 
-Describe "pkg-config" {
-    It "pkg-config" {
-        "pkg-config --version" | Should -ReturnZeroExitCode
+Describe "pkgconf" {
+    It "pkgconf" {
+        "pkgconf --version" | Should -ReturnZeroExitCode
     }
 }
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
@@ -197,7 +197,7 @@
             "p7zip",
             "packer",
             "perl",
-            "pkg-config",
+            "pkgconf",
             "subversion",
             "swiftformat",
             "swig",