summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-08-19 00:39:07 +0800
committerruki <[email protected]>2021-08-19 00:39:07 +0800
commitc3b21f59947f34aa38881f621d21fd76fef5f008 (patch)
treef352817088b797c4cb66e0b20a03656c752c6a58
parent97df909b7731b4fa4a6bb399e6fffba4e76ce09f (diff)
check buildhash
-rw-r--r--xmake/modules/private/action/require/impl/lock_packages.lua2
-rw-r--r--xmake/modules/private/action/require/impl/package.lua5
2 files changed, 5 insertions, 2 deletions
diff --git a/xmake/modules/private/action/require/impl/lock_packages.lua b/xmake/modules/private/action/require/impl/lock_packages.lua
index e11916db6..a5e971b60 100644
--- a/xmake/modules/private/action/require/impl/lock_packages.lua
+++ b/xmake/modules/private/action/require/impl/lock_packages.lua
@@ -42,10 +42,8 @@ function _lock_package(instance)
result.name = instance:name()
result.plat = instance:plat()
result.arch = instance:arch()
- result.kind = instance:kind()
result.version = instance:version_str()
result.buildhash = instance:buildhash()
- result.is_built = instance:is_built()
result.branch = instance:branch()
result.tag = instance:tag()
if repo then
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 627d5e70e..148758c59 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -747,6 +747,11 @@ function _load_package(packagename, requireinfo, opt)
on_load(package)
end
+ -- check build hash
+ if locked_requireinfo and locked_requireinfo.buildhash ~= package:buildhash() then
+ wprint("package(%s): buildhash is not matched in xmake-requires.lock", package:displayname(), locked_requireinfo.buildhash, package:buildhash())
+ end
+
-- load environments from the manifest to enable the environments of on_install()
package:envs_load()