From cbc17f2905eecc5a373afe1248ddecd86f42c244 Mon Sep 17 00:00:00 2001 From: apocelipes Date: Wed, 10 Dec 2025 15:31:12 +0800 Subject: [PATCH 1/4] lsp-framework: fix build --- packages/l/lsp-framework/xmake.lua | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/l/lsp-framework/xmake.lua b/packages/l/lsp-framework/xmake.lua index e4aabe37d1f..2b6b305860b 100644 --- a/packages/l/lsp-framework/xmake.lua +++ b/packages/l/lsp-framework/xmake.lua @@ -6,12 +6,14 @@ package("lsp-framework") add_urls("https://github.com/leon-bckl/lsp-framework/archive/refs/tags/$(version).tar.gz", "https://github.com/leon-bckl/lsp-framework.git") + add_versions("1.3.0", "b6b4c0cad392b5e6b5b3897095199ed1b9217b7e468d61993eb4e091972c264b") add_versions("1.0.1", "07f924d851896a2d424d554d20820483f8458aa1ff907bb68657b0d2d0bd0d13") add_patches("1.0.1", "patches/1.0.1/fix-install.diff", "bb5e4436091ba1846144ffa80fb8afd4d0213760bce45dd6fd31662905cb4bc3") add_patches("1.0.1", "patches/1.0.1/fix-missing-ios.diff", "8447605c2ed14cfbf394b29ffe2348e2179424504100aa01cd88b3d054e5ceb1") add_deps("cmake") + add_links("lsp") if is_plat("linux", "bsd") then add_syslinks("pthread") @@ -20,11 +22,18 @@ package("lsp-framework") end if on_check then - on_check("windows|arm64", function (package) - import("core.base.semver") - local vs = package:toolchain("msvc"):config("vs") - assert(tonumber(vs) >= 2022, "lsp-framework requires Visual Studio 2022 and later for arm64 targets") - assert(os.arch() == "arm64", "package(lsp-framework): requires host arch to be arm64.") + on_check(function (package) + if package:is_plat("windows") and package:is_arch("arm64") then + import("core.base.semver") + local vs = package:toolchain("msvc"):config("vs") + assert(tonumber(vs) >= 2022, "package(lsp-framework): requires Visual Studio 2022 and later for arm64 targets") + assert(os.arch() == "arm64", "package(lsp-framework): requires host arch to be arm64.") + end + if package:is_plat("macosx") then + if macos.version():lt("15") then + raise("package(lsp-framework): requires macOS version >= 15.") + end + end end) end From f07514b8a5f2ebdab31a269654b5f8bd20548303 Mon Sep 17 00:00:00 2001 From: apocelipes Date: Wed, 10 Dec 2025 17:02:47 +0800 Subject: [PATCH 2/4] fix windows --- packages/l/lsp-framework/xmake.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/l/lsp-framework/xmake.lua b/packages/l/lsp-framework/xmake.lua index 2b6b305860b..6b5572954e5 100644 --- a/packages/l/lsp-framework/xmake.lua +++ b/packages/l/lsp-framework/xmake.lua @@ -39,6 +39,10 @@ package("lsp-framework") on_install("windows", "linux", "macosx", "mingw@windows", "bsd", function (package) local configs = {} + if package:version():ge("1.3.0") then + io.replace("CMakeLists.txt", "install(TARGETS lsp EXPORT lsp ARCHIVE LIBRARY)", "install(TARGETS lsp EXPORT lsp RUNTIME ARCHIVE LIBRARY)", {plain = true}) + table.insert(configs, "-DCMAKE_INSTALL_LIBDIR=lib") + end table.insert(configs, "-DLSP_USE_SANITIZERS=" .. (package:config("asan") and "ON" or "OFF")) table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) From a708a933fe07fe41df3cd876d1b2336d04b851d0 Mon Sep 17 00:00:00 2001 From: apocelipes Date: Wed, 10 Dec 2025 17:12:06 +0800 Subject: [PATCH 3/4] fix shared --- packages/l/lsp-framework/xmake.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/l/lsp-framework/xmake.lua b/packages/l/lsp-framework/xmake.lua index 6b5572954e5..5ece0c05574 100644 --- a/packages/l/lsp-framework/xmake.lua +++ b/packages/l/lsp-framework/xmake.lua @@ -13,7 +13,6 @@ package("lsp-framework") add_patches("1.0.1", "patches/1.0.1/fix-missing-ios.diff", "8447605c2ed14cfbf394b29ffe2348e2179424504100aa01cd88b3d054e5ceb1") add_deps("cmake") - add_links("lsp") if is_plat("linux", "bsd") then add_syslinks("pthread") From 674edfd94f785bb89620260a6388de5a191f24b8 Mon Sep 17 00:00:00 2001 From: apocelipes Date: Wed, 10 Dec 2025 17:47:45 +0800 Subject: [PATCH 4/4] fix install --- packages/l/lsp-framework/xmake.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/l/lsp-framework/xmake.lua b/packages/l/lsp-framework/xmake.lua index 5ece0c05574..a78e6dc0829 100644 --- a/packages/l/lsp-framework/xmake.lua +++ b/packages/l/lsp-framework/xmake.lua @@ -42,6 +42,9 @@ package("lsp-framework") io.replace("CMakeLists.txt", "install(TARGETS lsp EXPORT lsp ARCHIVE LIBRARY)", "install(TARGETS lsp EXPORT lsp RUNTIME ARCHIVE LIBRARY)", {plain = true}) table.insert(configs, "-DCMAKE_INSTALL_LIBDIR=lib") end + if package:is_plat("windows") and package:config("shared") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end table.insert(configs, "-DLSP_USE_SANITIZERS=" .. (package:config("asan") and "ON" or "OFF")) table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))