From a3c6be532a4056cd5381a77caab6ce7c5ae376bc Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 11 Oct 2024 01:13:16 +0000 Subject: [PATCH 1/3] Update libassert to v2.1.2 --- packages/l/libassert/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libassert/xmake.lua b/packages/l/libassert/xmake.lua index ee5fea0f1a2..5772b8a6dd6 100644 --- a/packages/l/libassert/xmake.lua +++ b/packages/l/libassert/xmake.lua @@ -6,6 +6,7 @@ package("libassert") add_urls("https://github.com/jeremy-rifkin/libassert/archive/refs/tags/$(version).tar.gz", "https://github.com/jeremy-rifkin/libassert.git") + add_versions("v2.1.2", "a7220ca354270deca08a7a162b93523c738ba3c8037a4df1a46ababfdc664196") add_versions("v2.1.1", "2bdf27523f964f41668d266cfdbd7f5f58988af963d976577195969ed44359d1") add_versions("v2.1.0", "e42405b49cde017c44c78aacac35c6e03564532838709031e73d10ab71f5363d") add_versions("v2.0.2", "4a0b52e6523bdde0116231a67583131ea1a84bb574076fad939fc13fc7490443") From edc6e9fa3e6213be4eaeda4ada6ac1b256e44efc Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 14 Oct 2024 07:18:43 +0800 Subject: [PATCH 2/3] cpptrace: add v0.7.2 version --- packages/c/cpptrace/xmake.lua | 1 + packages/l/libassert/xmake.lua | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/packages/c/cpptrace/xmake.lua b/packages/c/cpptrace/xmake.lua index b615ebccad6..c34aef68780 100644 --- a/packages/c/cpptrace/xmake.lua +++ b/packages/c/cpptrace/xmake.lua @@ -6,6 +6,7 @@ package("cpptrace") add_urls("https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/$(version).tar.gz", "https://github.com/jeremy-rifkin/cpptrace.git") + add_versions("v0.7.2", "62835abfd91a840e4d212c850695b576523fe6f9036bc5c3e52183b6eb9905c5") add_versions("v0.7.1", "63df54339feb0c68542232229777df057e1848fc8294528613971bbf42889e83") add_versions("v0.7.0", "b5c1fbd162f32b8995d9b1fefb1b57fac8b1a0e790f897b81cdafe3625d12001") add_versions("v0.6.3", "665bf76645ec7b9e6d785a934616f0138862c36cdb58b0d1c9dd18dd4c57395a") diff --git a/packages/l/libassert/xmake.lua b/packages/l/libassert/xmake.lua index 5772b8a6dd6..701755e8738 100644 --- a/packages/l/libassert/xmake.lua +++ b/packages/l/libassert/xmake.lua @@ -68,6 +68,11 @@ package("libassert") table.insert(configs, "-DLIBASSERT_USE_MAGIC_ENUM=" .. (package:config("magic_enum") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end + + if package:is_plat("windows") and package:is_debug() then + local dir = package:installdir(package:config("shared") and "bin" or "lib") + os.trycp(path.join(package:buildir(), "assert.pdb"), dir) + end end) on_test(function (package) From f184bfc65331b6cb68fc367ab81689d58117fe7b Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 14 Oct 2024 07:41:20 +0800 Subject: [PATCH 3/3] cpptrace: improve deps --- packages/c/cpptrace/xmake.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/c/cpptrace/xmake.lua b/packages/c/cpptrace/xmake.lua index c34aef68780..832ab6f594d 100644 --- a/packages/c/cpptrace/xmake.lua +++ b/packages/c/cpptrace/xmake.lua @@ -22,16 +22,14 @@ package("cpptrace") add_patches("0.5.2", "https://github.com/jeremy-rifkin/cpptrace/commit/599d6abd6cc74e80e8429fc309247be5f7edd5d7.patch", "977e6c17400ff2f85362ca1d6959038fdb5d9e5b402cfdd705b422c566e8e87a") - if is_plat("windows") then + if is_plat("windows", "mingw") then add_syslinks("dbghelp") - elseif is_plat("macosx") then - add_deps("libdwarf") elseif is_plat("linux") then - add_deps("libdwarf") add_syslinks("dl") - elseif is_plat("mingw") then + end + + if not is_plat("windows") then add_deps("libdwarf") - add_syslinks("dbghelp") end add_deps("cmake")