diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 7a7d2222fe..2aad609f11 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-tool-meson", "version": "1.9.0", - "port-version": 4, + "port-version": 5, "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", diff --git a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake index 3796697fa2..08c0187ec0 100644 --- a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake +++ b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake @@ -239,6 +239,9 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "riscv64") set(host_cpu_fam riscv64) set(host_cpu riscv64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)64(EC|ec)$") + set(host_cpu_fam aarch64) + set(host_cpu arm64ec) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)64$") set(host_cpu_fam aarch64) set(host_cpu armv8) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index ac20f5295f..6ed9c9e465 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -226,6 +226,9 @@ function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #h elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86") set(host_cpu_fam x86) set(host_cpu i686) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)64(EC|ec)$") + set(host_cpu_fam aarch64) + set(host_cpu arm64ec) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)64$") set(host_cpu_fam aarch64) set(host_cpu armv8) diff --git a/versions/baseline.json b/versions/baseline.json index 64edffca76..25466f7cb7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10522,7 +10522,7 @@ }, "vcpkg-tool-meson": { "baseline": "1.9.0", - "port-version": 4 + "port-version": 5 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 8b6ed0a150..c93b29ea44 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42508f7c39ca81723ba3486846883952f4b450db", + "version": "1.9.0", + "port-version": 5 + }, { "git-tree": "94172d82fdbae8b2211e76473b78ebd2b037a695", "version": "1.9.0",