diff --git a/packages/lua-language-server/bee.lua-project-common.patch b/packages/lua-language-server/bee.lua-project-common.patch index 1e02083e01..39efc41d2f 100644 --- a/packages/lua-language-server/bee.lua-project-common.patch +++ b/packages/lua-language-server/bee.lua-project-common.patch @@ -1,10 +1,10 @@ ---- lua-language-server/3rd/bee.lua/project/common.lua 2021-10-22 15:08:44.191055637 +0530 -+++ lua-language-server-patch/3rd/bee.lua/project/common.lua 2021-10-27 20:49:53.575106308 +0530 -@@ -45,6 +45,7 @@ +--- a/3rd/bee.lua/project/common.lua 2022-04-09 13:50:01.885789789 +0530 ++++ b/3rd/bee.lua/project/common.lua 2022-04-09 21:40:55.007369456 +0530 +@@ -53,6 +53,7 @@ } }, android = { -+ ldflags ="-landroid-spawn", ++ ldflags = "-landroid-spawn", sources = { - "!bee/**_win.cpp", - "!bee/**_osx.cpp", + "!bee/**/*_win.cpp", + "!bee/**/*_osx.cpp", diff --git a/packages/lua-language-server/build.sh b/packages/lua-language-server/build.sh index 4ff0153ca9..5cb5c11c79 100644 --- a/packages/lua-language-server/build.sh +++ b/packages/lua-language-server/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE="https://github.com/sumneko/lua-language-server" TERMUX_PKG_DESCRIPTION="Sumneko Lua Language Server coded in Lua" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Aditya Alok " -TERMUX_PKG_VERSION=2.6.7 +TERMUX_PKG_VERSION=2.6.8 TERMUX_PKG_GIT_BRANCH="${TERMUX_PKG_VERSION}" TERMUX_PKG_SRCURL="https://github.com/sumneko/lua-language-server.git" TERMUX_PKG_DEPENDS="libandroid-spawn" @@ -22,7 +22,7 @@ _patch_on_device() { } termux_step_host_build() { - _patch_on_device + (_patch_on_device) termux_setup_ninja mkdir 3rd @@ -33,6 +33,8 @@ termux_step_host_build() { } termux_step_make() { + CFLAGS+=" -DBEE_ENABLE_FILESYSTEM" # without this, it tries to link against its own filesystem lib (though ndk >= 23 has std c++ filesystem) and fails. + sed \ -e "s%\@FLAGS\@%${CFLAGS} ${CPPFLAGS}%g" \ -e "s%\@LDFLAGS\@%${LDFLAGS}%g" \ diff --git a/packages/lua-language-server/make.lua.diff b/packages/lua-language-server/make.lua.diff index d6bae23aa6..77803323c9 100644 --- a/packages/lua-language-server/make.lua.diff +++ b/packages/lua-language-server/make.lua.diff @@ -1,18 +1,18 @@ --- a/make.lua 2022-03-30 20:11:02.703964364 +0530 +++ b/make.lua 2022-03-30 20:12:54.763964322 +0530 @@ -4,6 +4,9 @@ - + lm.bindir = "bin" - + +lm.flags = "@FLAGS@" +lm.ldflags = "@LDFLAGS@" + ---@diagnostic disable-next-line: codestyle-check lm.EXE_DIR = "" - + @@ -144,6 +147,5 @@ } - + lm:default { - "bee-test", - "unit-test",