diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4bc2b4cdc4..d4e151b068 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -169,6 +169,7 @@ vcpkgExtractTar() # Linux # useMuslC -> download vcpkg-muslc # amd64 -> download vcpkg-glibc +# arm64 -> download vcpkg-glibc-arm64 # Otherwise # Download and build from source @@ -188,6 +189,10 @@ elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." vcpkgToolReleaseSha=$VCPKG_GLIBC_SHA vcpkgToolName="vcpkg-glibc" +elif [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then + echo "Downloading vcpkg-arm64-glibc..." + vcpkgToolReleaseSha=$VCPKG_GLIBC_ARM64_SHA + vcpkgToolName="vcpkg-glibc-arm64" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" diff --git a/scripts/tls12-download-arm64.exe b/scripts/tls12-download-arm64.exe index 5d660a8b7c..9df2283e6d 100644 Binary files a/scripts/tls12-download-arm64.exe and b/scripts/tls12-download-arm64.exe differ diff --git a/scripts/tls12-download.exe b/scripts/tls12-download.exe old mode 100755 new mode 100644 index 487192e363..7bcfc74d9d Binary files a/scripts/tls12-download.exe and b/scripts/tls12-download.exe differ diff --git a/scripts/update-vcpkg-tool-metadata.ps1 b/scripts/update-vcpkg-tool-metadata.ps1 index bc1cce9698..231394f620 100644 --- a/scripts/update-vcpkg-tool-metadata.ps1 +++ b/scripts/update-vcpkg-tool-metadata.ps1 @@ -15,8 +15,8 @@ Set-Content -LiteralPath "$PSScriptRoot\vcpkg-tool-metadata.txt" -Value $metadat "--url=https://github.com/microsoft/vcpkg-tool/releases/download/$Date/vcpkg-arm64.exe" --skip-sha512 # Linux Binaries -foreach ($binary in @('macos', 'muslc', 'glibc')) { - $caps = $binary.ToUpperInvariant() +foreach ($binary in @('macos', 'muslc', 'glibc', 'glibc-arm64')) { + $caps = $binary.ToUpperInvariant().Replace('-', '_') & $vcpkg x-download "$PSScriptRoot\vcpkg-$binary" ` "--url=https://github.com/microsoft/vcpkg-tool/releases/download/$Date/vcpkg-$binary" --skip-sha512 $sha512 = & $vcpkg hash "$PSScriptRoot\vcpkg-$binary" @@ -36,6 +36,7 @@ Remove-Item @( "$PSScriptRoot\vcpkg-macos", "$PSScriptRoot\vcpkg-muslc", "$PSScriptRoot\vcpkg-glibc", + "$PSScriptRoot\vcpkg-glibc-arm64", "$PSScriptRoot\$sourceName" ) diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index 5da235af62..13d9861c95 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,6 @@ -VCPKG_TOOL_RELEASE_TAG=2025-03-13 -VCPKG_MACOS_SHA=7d9b4efa699676417616bc1974019f98fdcdb2df5d853b35ccb4dcc9683310bf37b69a9f8e45f2ee5a21fc0f41c52fb1cee4ba8b3c9d73359b5895ac29415264 -VCPKG_MUSLC_SHA=ccd1a0696241006a0e7e0f815fb9aa78a3d88167ab236112e1d23d9c1c1a0999a7f38d0891b07cfd5757183c532762ec56e1e1fd76afb20eaa0b112a5eeb668f -VCPKG_GLIBC_SHA=e61c049720df43ac37ddc78a4154b3b215c41be9e3a059307f48d0378ba225106b8f19a9f661fcbf507d4853d4495db3564a18504e8a37ee300c02bf1a88c44a -VCPKG_TOOL_SOURCE_SHA=87ab747bf1b74f826fb43a79beaa57e32feaf46825c32b72b506ee7c6421a8457fba14a516c29ec2128ccd59218a10b6d2f8bba2cbe59069c64a8e27c67684cd +VCPKG_TOOL_RELEASE_TAG=2025-03-22 +VCPKG_MACOS_SHA=9732c176969116aa934613cca72d032b0373a2ceb340d9f13b787b0a6c086020f65625d3d3b691ff864983406e437ff26881bf5751e5dbd544aa94a8cf15cfed +VCPKG_MUSLC_SHA=269904f06f8e851833381f5876e9fe9f3eac89ff6d60eaa87ef7e4a018df8773703335ad0927cbab7f60a3ff1706167087ccb53b6f646750645920ea00b5f8b3 +VCPKG_GLIBC_SHA=671dec56b1387698e4188404f67f651078af9c15b6eb6fb83ec17e745eefea30592e9edde77b033c719376eccdc275a2020b877b2f1afcdf9d07b0ccb9522005 +VCPKG_GLIBC_ARM64_SHA=b02d03cfa4c2c40b81c7ccc0c0d7c90f0b07313b3d86abc6580744d6aeb34fa9e7630059ba470fa430d49935757c36a9bd6be00e82ff5e7abcb8404fcba3cf3e +VCPKG_TOOL_SOURCE_SHA=bd964a2a23a00e4c3ce7f7842e0bf200baf40ffd231e5309a41f92e6622d81a08f2f8ad3513685b0cf3a95485105eb37588fe568b710d492184043b540b00e82