[crux-commits] ports/contrib (3.7): lua-language-server: fixed footprint

18 Aug 2023

commit 4ca164d784157e2823c72b9bf3d108225335d0c6
Author: Tim Biermann <tbier@posteo.de>
Date:   Fri Aug 18 22:39:19 2023 +0200

    lua-language-server: fixed footprint

diff --git a/lua-language-server/.footprint b/lua-language-server/.footprint
index df8a37a40..b46614fe7 100644
--- a/lua-language-server/.footprint
+++ b/lua-language-server/.footprint
@@ -26,16 +26,6 @@ drwxr-xr-x	root/root	usr/lib/lua-language-server/locale/zh-tw/
 -rw-r--r--	root/root	usr/lib/lua-language-server/locale/zh-tw/setting.lua
 -rw-r--r--	root/root	usr/lib/lua-language-server/main.lua
 drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/
-drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/198256b1/
-drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/198256b1/home/
-drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/198256b1/home/pkgmk/
-drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/198256b1/home/pkgmk/work/
-drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/198256b1/home/pkgmk/work/lua-language-server/
-drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/198256b1/home/pkgmk/work/lua-language-server/src/
-drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/198256b1/home/pkgmk/work/lua-language-server/src/lua-language-server-3.6.25/
-drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/198256b1/home/pkgmk/work/lua-language-server/src/lua-language-server-3.6.25/test_root/
-drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/198256b1/home/pkgmk/work/lua-language-server/src/lua-language-server-3.6.25/test_root/unittest/
--rw-r--r--	root/root	usr/lib/lua-language-server/meta/198256b1/home/pkgmk/work/lua-language-server/src/lua-language-server-3.6.25/test_root/unittest/ffi.lua
 drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/3rd/
 drwxr-xr-x	root/root	usr/lib/lua-language-server/meta/3rd/Cocos4.0/
 -rw-r--r--	root/root	usr/lib/lua-language-server/meta/3rd/Cocos4.0/config.json
diff --git a/lua-language-server/.signature b/lua-language-server/.signature
index 5b56bc2bb..038b7b19c 100644
--- a/lua-language-server/.signature
+++ b/lua-language-server/.signature
@@ -1,7 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+LRbBjB927ku77GPL3qkCEYApu0hnnmZVQtYM6Gy6J4UeSl7BY4ADE3Eo/UtL+EaCVYWOicpsBACgvrkA/YngU=
-SHA256 (Pkgfile) = 96889bbdf611f7bca83acc8183ce7fd51f3269ec92115e488c031d212c7427bb
-SHA256 (.footprint) = 52e4830a9936cc7f8ce52ca1440624d0cb4e1ffb705ff55531dac19018e1a19d
+RWSagIOpLGJF353Mm4uaf3BB9nFEvlu1DTkNgKUSFv3XiOxSbhhSnljQ/U3LP6fWBGflMvMqv1lAXV4wQ+6i+FDLvWkJrx7fDAE=
+SHA256 (Pkgfile) = 13e838f36eaa8d09d7785f491e320f79f9966a627f309f676f1851145cf10679
+SHA256 (.footprint) = ef7e875a8f632a33d030e3b68ce82ae1dd07134a111c2a1a4df9b2eae01b2363
 SHA256 (lua-language-server-3.6.25.tar.gz) = c2dcd51616d612a9735b412bdacb0e50f66333b75de059823ad946451f4d5dae
 SHA256 (lua-language-server-3.6.25-submodules.zip) = 0808ac7a3e35a246260a2818844093e5fcf7e0cc89744780f37dc26b82fff12c
+SHA256 (linux.ninja.patch) = 6004d3c6679c0bf5c4008aadd1d0649638acac06f92f2cbe54f1aeb9b8c2d9ee
 SHA256 (wrapper.sh) = c22dec148487ae1e170e460ab9c2de9ff06b8f0b4d19690913ccb4a0fb3bdd0e
diff --git a/lua-language-server/Pkgfile b/lua-language-server/Pkgfile
index ea8437115..7aafa8db3 100644
--- a/lua-language-server/Pkgfile
+++ b/lua-language-server/Pkgfile
@@ -1,13 +1,14 @@
 # Description: lua language server
 # URL: https://github.com/sumneko/lua-language-server
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: lua ninja
+# Depends on: lua
 
 name=lua-language-server
 version=3.6.25
-release=1
+release=2
 source=(https://github.com/sumneko/lua-language-server/archive/$version/$name-$versi...
   https://github.com/sumneko/lua-language-server/releases/download/$version/lu...
+  linux.ninja.patch
   wrapper.sh)
 
 build() {
@@ -15,13 +16,22 @@ build() {
 
   cd $name-$version
 
+  patch -Np1 -i $SRC/linux.ninja.patch
+  sed -i -e "s/^cc = REPLACE_ME/cc = cc/" \
+    -e "s/^ar = REPLACE_AR/ar = ar/" \
+    -e "s/CFLAGS/${CFLAGS}/" \
+    -e "s/CXXFLAGS/${CXXFLAGS}/" \
+    -e "s/LDFLAGS/${LDFLAGS}/" \
+    3rd/luamake/compile/ninja/linux.ninja
+
   ninja -C 3rd/luamake -f compile/ninja/linux.ninja
   ./3rd/luamake/luamake rebuild
 
+  install -Dm0755 $SRC/wrapper.sh $PKG/usr/bin/lua-language-server
   install -Dt $PKG/usr/lib/$name/bin bin/$name
   install -m644 -t $PKG/usr/lib/$name/bin bin/main.lua
   install -m644 -t $PKG/usr/lib/$name {debugger,main}.lua
-  cp -r locale meta script $PKG/usr/lib/$name
 
-  install -Dm0755 $SRC/wrapper.sh $PKG/usr/bin/lua-language-server
-  }
+  rm -r meta/198256b1
+  cp -r locale meta script $PKG/usr/lib/$name
+}
diff --git a/lua-language-server/linux.ninja.patch b/lua-language-server/linux.ninja.patch
new file mode 100644
index 000000000..c45d29051
--- /dev/null
+++ b/lua-language-server/linux.ninja.patch
@@ -0,0 +1,79 @@
+--- a/3rd/luamake/compile/ninja/linux.ninja
++++ b/3rd/luamake/compile/ninja/linux.ninja
+@@ -2,12 +2,12 @@
+ builddir = build/linux
+ bin = $builddir/bin
+ obj = $builddir/obj
+-cc = gcc
+-ar = ar
++cc = REPLACE_ME
++ar = REPLACE_AR
+ luamake = luamake
+ rule c_source_bee
+   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+-    -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in
++    -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+@@ -15,14 +15,14 @@
+     bee.lua/3rd/lua-seri/lua-seri.c
+ rule cxx_source_bee
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
++    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_bee/format.obj: cxx_source_bee bee.lua/3rd/fmt/format.cc
+ rule cxx_source_bee_1
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in
++    -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -57,7 +57,7 @@
+ rule cxx_source_bee_2
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+     -fvisibility=hidden -Ibee.lua -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC $
+-    -o $out -c $in
++    -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -80,14 +80,14 @@
+ rule c_source_lua
+   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+     -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
+-  description = Compile C   $out
++  description = Compile C   $out CFLAGS
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
+ rule c_source_lua_1
+   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
+     -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in
+-  description = Compile C   $out
++  description = Compile C   $out CFLAGS
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
+@@ -95,7 +95,7 @@
+ rule cxx_source_bootstrap
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+     -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
+-    -DNDEBUG -fPIC -o $out -c $in
++    -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -103,7 +103,7 @@
+     bee.lua/bootstrap/main.cpp
+ rule link_bootstrap
+   command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $
+-    -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++    -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
+   description = Link    Exe $out
+ build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
+     $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $

    

[crux-commits] ports/contrib (3.7): lua-language-server: fixed footprint

crux＠crux.nu