Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −37
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions images/macos/scripts/build/install-pkg-config.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
6 changes: 3 additions & 3 deletions images/macos/scripts/docs-gen/SoftwareReport.Common.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 6 additions & 0 deletions images/macos/scripts/tests/BasicTools.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
6 changes: 0 additions & 6 deletions images/macos/scripts/tests/Common.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,3 @@ Describe "Unxip" {
"unxip --version" | Should -ReturnZeroExitCode
}
}

Describe "pkg-config" {
It "pkg-config" {
"pkg-config --version" | Should -ReturnZeroExitCode
}
}
3 changes: 1 addition & 2 deletions images/macos/templates/macOS-13.anka.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down
3 changes: 1 addition & 2 deletions images/macos/templates/macOS-13.arm64.anka.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down
3 changes: 1 addition & 2 deletions images/macos/templates/macOS-14.anka.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down
3 changes: 1 addition & 2 deletions images/macos/templates/macOS-14.arm64.anka.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down
3 changes: 1 addition & 2 deletions images/macos/templates/macOS-15.anka.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down
3 changes: 1 addition & 2 deletions images/macos/templates/macOS-15.arm64.anka.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down
1 change: 1 addition & 0 deletions images/macos/toolsets/toolset-13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"p7zip",
"packer",
"perl",
"pkgconf",
"swiftformat",
"tcl-tk@8",
"zstd",
Expand Down
1 change: 1 addition & 0 deletions images/macos/toolsets/toolset-14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"p7zip",
"packer",
"perl",
"pkgconf",
"swiftformat",
"tcl-tk@8",
"zstd",
Expand Down
1 change: 1 addition & 0 deletions images/macos/toolsets/toolset-15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"p7zip",
"packer",
"perl",
"pkgconf",
"swiftformat",
"zstd",
"gmp",
Expand Down