Merge pull request #7869 from MrAdityaAlok/update-lua-lsp

lua-language-server: Update

packages/lua-language-server/android.patch.ondevice.beforehostbuild

@@ -0,0 +1,11 @@
+--- lua-language-server/3rd/luamake/compile/ninja/android.ninja	2021-10-27 21:38:40.667928105 +0530
++++ lua-language-server-patch/3rd/luamake/compile/ninja/android.ninja	2021-10-27 21:37:31.217928132 +0530
+@@ -116,7 +116,7 @@
+ build $obj/source_bootstrap/progdir.obj: cxx_source_bootstrap $
+     3rd/bee.lua/bootstrap/progdir.cpp
+ rule link_luamake
+-  command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++ -s
++  command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++ -landroid-spawn -s
+   description = Link    Exe $out
+ build $bin/luamake: link_luamake $obj/source_bootstrap/main.obj $
+     $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $

packages/lua-language-server/bee.lua-project-common.patch

@@ -1,11 +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-25 22:52:35.474777452 +0530
-@@ -45,6 +45,8 @@
++++ lua-language-server-patch/3rd/bee.lua/project/common.lua	2021-10-27 20:49:53.575106308 +0530
+@@ -45,6 +45,7 @@
          }
      },
      android = {
-+        flags ="-fPIC",
-+        ldflags ="-L@TERMUX_PREFIX@/lib -landroid-spawn",
++        ldflags ="-landroid-spawn",
          sources = {
              "!bee/**_win.cpp",
              "!bee/**_osx.cpp",

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="MrAdityaAlok <dev.aditya.alok@gmail.com>"
-TERMUX_PKG_VERSION=2.4.5
+TERMUX_PKG_VERSION=2.4.6
 TERMUX_PKG_SRCURL=https://github.com/sumneko/lua-language-server.git
 TERMUX_PKG_GIT_BRANCH="${TERMUX_PKG_VERSION}"
 TERMUX_PKG_BUILD_DEPENDS="libandroid-spawn"
@@ -13,23 +13,36 @@ TERMUX_PKG_BUILD_IN_SRC=true
 # https://github.com/actboy168/bee.lua/blob/32f65b92739fa236d87fc1b2e7617470d47f0355/bee/thread/spinlock.h#L14
 TERMUX_PKG_BLACKLISTED_ARCHES="arm,i686"
 
+_patch() {
+	if [ "${TERMUX_ON_DEVICE_BUILD}" = true ]; then
+		current_dir=$(pwd)
+
+		cd "${TERMUX_PKG_SRCDIR}"
+		patch --silent -p1 <"${TERMUX_PKG_BUILDER_DIR}"/android.patch.ondevice.beforehostbuild
+
+		cd "${current_dir}"
+	fi
+}
+
 termux_step_host_build() {
+	_patch
 	termux_setup_ninja
 
 	mkdir 3rd
 	cp -a "${TERMUX_PKG_SRCDIR}"/3rd/luamake 3rd/
 
 	cd 3rd/luamake
-	if [ "${TERMUX_ON_DEVICE_BUILD}" = true ]; then
-		sed -i "s/-lstdc++/-lc++_static -lc++abi -landroid-spawn/g" ./compile/ninja/android.ninja
-	fi
 	./compile/install.sh
 }
 
 termux_step_make() {
+	sed \
+		-e "s%\@FLAGS\@%${CFLAGS} ${CPPFLAGS}%g" \
+		-e "s%\@LDFLAGS\@%${LDFLAGS}%g" \
+		"${TERMUX_PKG_BUILDER_DIR}"/make.lua.diff | patch --silent -p1
+
 	"${TERMUX_PKG_HOSTBUILD_DIR}"/3rd/luamake/luamake \
 		-cc "${CC}" \
-		-flags "${CFLAGS} ${CPPFLAGS}" \
 		-hostos "android"
 }
 

packages/lua-language-server/make.lua.diff

@@ -1,15 +1,18 @@
---- a/make.lua	2021-10-22 13:27:28.381004922 +0530
-+++ b/make.lua	2021-10-22 13:30:47.541004846 +0530
-@@ -2,7 +2,7 @@
+--- lua-language-server/make.lua	2021-10-22 15:07:23.591055667 +0530
++++ lua-language-server-patch/make.lua	2021-10-27 20:41:28.435106500 +0530
+@@ -2,7 +2,10 @@
  local platform = require 'bee.platform'
  local exe      = platform.OS == 'Windows' and ".exe" or ""
  
 -lm.bindir = "bin/"..platform.OS
 +lm.bindir = "bin/Android"
++
++lm.flags = "@FLAGS@"
++lm.ldflags = "@LDFLAGS@"
  
  lm.EXE_DIR = ""
  lm:import "3rd/bee.lua/make.lua"
-@@ -42,29 +42,7 @@
+@@ -42,29 +45,7 @@
      output = lm.bindir.."/main.lua",
  }