improve requirekey

3 files changed, 17 insertions, 16 deletions

diff --git a/tests/projects/package/toolchain_muslcc/xmake-requires.lock b/tests/projects/package/toolchain_muslcc/xmake-requires.lock
index 4379fdf79..4a07f4618 100644
--- a/tests/projects/package/toolchain_muslcc/xmake-requires.lock
+++ b/tests/projects/package/toolchain_muslcc/xmake-requires.lock
@@ -3,7 +3,7 @@
         version = "1.0"
     },
     ["macosx|x86_64"] = {
-        ["autoconf#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["autoconf#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "cd4169a7cb484832b2f70d2174072ca2",
             repo = {
                 branch = "master",
@@ -12,7 +12,7 @@
             },
             version = "2.71"
         },
-        ["automake#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["automake#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "5b4ee7b727764ece8aa3e149603cfc7a",
             repo = {
                 branch = "master",
@@ -21,7 +21,7 @@
             },
             version = "1.16.4"
         },
-        ["cmake#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["cmake#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "a6d18f8c0bf347d980f8bb762583c91a",
             repo = {
                 branch = "master",
@@ -30,7 +30,7 @@
             },
             version = "3.21.0"
         },
-        ["gmp#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["gmp#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "7dd9c224447e46698ac73d29f58b1d73",
             repo = {
                 branch = "master",
@@ -39,7 +39,7 @@
             },
             version = "6.2.1"
         },
-        ["libisl 0.22#3dd996fa365042e39791030c4e1cad52"] = {
+        ["libisl 0.22#671145042a9f4a96a5387ebff97a207d"] = {
             buildhash = "f649e1fb365e442e8f79f372fd91483b",
             repo = {
                 branch = "master",
@@ -48,7 +48,7 @@
             },
             version = "0.22"
         },
-        ["libogg#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["libogg#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "d894fc29f2fb4c45a0f48bc2c6ece273",
             repo = {
                 branch = "master",
@@ -57,7 +57,7 @@
             },
             version = "v1.3.4"
         },
-        ["libplist#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["libplist#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "0c01b22920be4876b1de74629194eb8f",
             repo = {
                 branch = "master",
@@ -66,7 +66,7 @@
             },
             version = "2.2.0"
         },
-        ["libtool#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["libtool#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "64584ec84a4743ecb740b598b263ffa6",
             repo = {
                 branch = "master",
@@ -75,7 +75,7 @@
             },
             version = "2.4.6"
         },
-        ["m4#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["m4#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "fd0e83e5759b442a970327ebb1c89793",
             repo = {
                 branch = "master",
@@ -84,7 +84,7 @@
             },
             version = "1.4.19"
         },
-        ["muslcc#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["muslcc#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "11062c09ebeb484594488ad73ddbcd1f",
             repo = {
                 branch = "master",
@@ -93,7 +93,7 @@
             },
             version = "20210202"
         },
-        ["pkg-config#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["pkg-config#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "84fd7f9b9f7a47709512cfc85cd9e5f7",
             repo = {
                 branch = "master",
@@ -102,7 +102,7 @@
             },
             version = "0.29.2"
         },
-        ["zlib#ddbdd8b8f76d455a8c0ef45fffe37160"] = {
+        ["zlib#31fecfc4f022419cba33d3f9fc3cc783"] = {
             buildhash = "be90a245b8bb48e6b08a1a15bdcad467",
             repo = {
                 branch = "master",
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index d5d893658..55085d4f1 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -530,10 +530,8 @@ end
 
 -- get locked package key
 function _get_packagelock_key(requireinfo)
-    local plat        = config.plat() or os.subhost()
-    local arch        = config.arch() or os.subarch()
     local requirestr  = requireinfo.originstr
-    local key         = _get_requirekey(requireinfo, {hash = true, plat = plat, arch = arch})
+    local key         = _get_requirekey(requireinfo, {hash = true})
     return string.format("%s#%s", requirestr, key)
 end
 
@@ -648,7 +646,7 @@ function _load_package(packagename, requireinfo, opt)
         requireinfo.label = splitinfo[2]
     end
 
-    -- sve requirekey
+    -- save requirekey
     local requirekey = _get_packagelock_key(requireinfo)
     requireinfo.requirekey = requirekey
 
diff --git a/xmake/modules/private/action/require/impl/utils/requirekey.lua b/xmake/modules/private/action/require/impl/utils/requirekey.lua
index b07e4d50d..230a53acb 100644
--- a/xmake/modules/private/action/require/impl/utils/requirekey.lua
+++ b/xmake/modules/private/action/require/impl/utils/requirekey.lua
@@ -50,6 +50,9 @@ function main(requireinfo, opt)
         key = key .. ":" .. string.serialize(configs_order, true)
     end
     if opt.hash then
+        if key == "" then
+            key = "_"
+        end
         return hash.uuid(key):gsub("%-", ""):lower()
     else
         return key