fix multi-plat packages

2 files changed, 12 insertions, 0 deletions

diff --git a/xmake/modules/private/action/require/impl/install_packages.lua b/xmake/modules/private/action/require/impl/install_packages.lua
index 8358bcb3a..fbedc2bc9 100644
--- a/xmake/modules/private/action/require/impl/install_packages.lua
+++ b/xmake/modules/private/action/require/impl/install_packages.lua
@@ -69,6 +69,12 @@ function _get_package_configs_str(instance)
     end
     local requireinfo = instance:requireinfo()
     if requireinfo then
+        if requireinfo.plat then
+            table.insert(configs, requireinfo.plat)
+        end
+        if requireinfo.arch then
+            table.insert(configs, requireinfo.arch)
+        end
         for k, v in pairs(requireinfo.configs) do
             if type(v) == "boolean" then
                 table.insert(configs, k .. ":" .. (v and "y" or "n"))
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 1fe22eef5..dc6720eb5 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -429,6 +429,12 @@ end
 -- get package key
 function _get_packagekey(packagename, requireinfo, version)
     local key = packagename .. "/" .. (version or requireinfo.version)
+    if requireinfo.plat then
+        key = key .. "/" .. requireinfo.plat
+    end
+    if requireinfo.arch then
+        key = key .. "/" .. requireinfo.arch
+    end
     local configs = requireinfo.configs
     if configs then
         local configs_order = {}