public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: dev-util/lua-language-server/, dev-util/lua-language-server/files/
@ 2023-02-01 21:36 Viorel Munteanu
  0 siblings, 0 replies; 3+ messages in thread
From: Viorel Munteanu @ 2023-02-01 21:36 UTC (permalink / raw
  To: gentoo-commits

commit:     ee98eb82f75727acc6f06179940537a5ccc41891
Author:     Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
AuthorDate: Wed Feb  1 12:15:17 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 12:15:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ee98eb82

dev-util/lua-language-server: add 3.6.8, drop 3.6.7

Signed-off-by: Mathis Winterer <mrmagic223325 <AT> fedora.email>

 dev-util/lua-language-server/Manifest              |  2 +-
 .../lua-language-server/files/build.ninja.patch    | 75 +++++++---------------
 .../lua-language-server/files/linux.ninja.patch    | 44 +++++++------
 ...6.7.ebuild => lua-language-server-3.6.8.ebuild} |  0
 4 files changed, 49 insertions(+), 72 deletions(-)

diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 4bf23c810..7967eaa88 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1 +1 @@
-DIST lua-language-server-3.6.7.zip 32326158 BLAKE2B 9a83a23c280cd4610396ac67501d19f557dd5d5eb8018a5a48a01c6f699d9e6ad90f87cb9eabd605c921793e5cd3625a67069a792813a2e562a8a0693344d112 SHA512 033f352581dd2f94bf5df13e1ba861e15dc75246e9bf4668700cc700d98e82ebc3593b8f0fcbcd69dbef472fd6dbb84704d8a0068832832c3241a824ca9dca51
+DIST lua-language-server-3.6.8.zip 389244327 BLAKE2B 67299716586bd01f2fc48319b68319b48090b87d8f4c72b79c52022af39140490983edfd1145d88616c1fabcb7f6a62bed8defbab7a8f4fe3330176812994a58 SHA512 bf5633e7570fa44d62bb5a2e4414d4f0e197fcef3b1a9876ea90cf37a79ae17afaaecdc5d54917cc7fb44e01b7db34abd6329cef0df4e3207177a0a6a8ec54f2

diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
index 3760f9367..11db385d3 100644
--- a/dev-util/lua-language-server/files/build.ninja.patch
+++ b/dev-util/lua-language-server/files/build.ninja.patch
@@ -1,6 +1,6 @@
 --- a/build/build.ninja
 +++ b/build/build.ninja
-@@ -12,17 +12,17 @@
+@@ -12,18 +12,18 @@
      3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $
      make/code_format.lua
  rule c_source_bee
@@ -15,37 +15,40 @@
  build $obj/source_bee/lua-seri.obj: c_source_bee $
      3rd/bee.lua/3rd/lua-seri/lua-seri.c
  rule cxx_source_bee
--  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
--    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $out -c $in
-+  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
-+    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $out -c $in CXXFLAGS
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $
+-    $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
++    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $
++    $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -30,8 +30,8 @@
+@@ -31,8 +31,8 @@
      3rd/bee.lua/bee/nonstd/fmt/format.cc
  build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc
  rule cxx_source_bee_1
--  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
--    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
-+  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
 +    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -55,9 +55,9 @@
+@@ -56,9 +56,9 @@
  build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
      3rd/bee.lua/bee/utility/path_helper.cpp
  rule cxx_source_bee_2
--  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
-+  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
 -    -I$builddir/lua54 -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
++    -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
 +    -I$builddir/lua54 -DBEE_STATIC -DNDEBUG -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -78,26 +78,26 @@
+@@ -79,26 +79,26 @@
  build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
      3rd/bee.lua/binding/lua_time.cpp
  rule c_source_lua
@@ -71,15 +74,16 @@
  build $obj/source_lua/linit.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/linit.c
  build $obj/source_lua/onelua.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/onelua.c
  rule cxx_source_bootstrap
--  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
-+  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
--    -DNDEBUG -fPIC -o $out -c $in
-+    -DNDEBUG -o $out -c $in CXXFLAGS
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $
+-    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
++    -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $
++    -DLUA_USE_LINUX -DNDEBUG -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -107,7 +107,7 @@
+@@ -108,7 +108,7 @@
      3rd/bee.lua/bootstrap/progdir.cpp
  rule link_bootstrap
    command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $
@@ -88,34 +92,3 @@
    description = Link    Exe $out
  build /bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
      $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $
-@@ -145,10 +145,10 @@
-     3rd/bee.lua/test/test_thread.lua 3rd/bee.lua/test/test_time.lua | $
-     /bootstrap copy_script
- rule cxx_code_format
--  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
-+  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
-     -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/include $
-     -I3rd/bee.lua/3rd/lua -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include $
--    -DNDEBUG -Wall -Werror -o $out -c $in
-+    -DNDEBUG -Wall -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -273,7 +273,7 @@
- build $obj/code_format/Utf8.obj: cxx_code_format $
-     3rd/EmmyLuaCodeStyle/Util/src/Utf8.cpp
- rule c_lpeglabel
--  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-+  command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
-     -o $out -c $in
-   description = Compile C   $out
-@@ -285,7 +285,7 @@
- build $obj/lpeglabel/lpltree.obj: c_lpeglabel 3rd/lpeglabel/lpltree.c
- build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
- rule cxx_lua_language_server
--  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
-+  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
-     -DNDEBUG -o $out -c $in
-   description = Compile C++ $out

diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch
index a16055fd7..3be7fba75 100644
--- a/dev-util/lua-language-server/files/linux.ninja.patch
+++ b/dev-util/lua-language-server/files/linux.ninja.patch
@@ -1,6 +1,6 @@
 --- a/3rd/luamake/compile/ninja/linux.ninja
 +++ b/3rd/luamake/compile/ninja/linux.ninja
-@@ -2,20 +2,20 @@
+@@ -2,21 +2,21 @@
  builddir = build/linux
  bin = $builddir/bin
  obj = $builddir/obj
@@ -19,37 +19,40 @@
  build $obj/source_bee/lua-seri.obj: c_source_bee $
      3rd/bee.lua/3rd/lua-seri/lua-seri.c
  rule cxx_source_bee
--  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
--    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $out -c $in
-+  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
-+    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $out -c $in CXXFLAGS
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $
+-    $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
++    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $
++    $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -23,8 +23,8 @@
+@@ -24,8 +24,8 @@
      3rd/bee.lua/bee/nonstd/fmt/format.cc
  build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc
  rule cxx_source_bee_1
--  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
--    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
-+  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
 +    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -48,9 +48,9 @@
+@@ -49,9 +49,9 @@
  build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
      3rd/bee.lua/bee/utility/path_helper.cpp
  rule cxx_source_bee_2
--  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
-+  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
 -    -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
++    -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
 +    -Itools/lua54 -DBEE_STATIC -DNDEBUG -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -71,25 +71,25 @@
+@@ -72,25 +72,25 @@
  build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
      3rd/bee.lua/binding/lua_time.cpp
  rule c_source_lua
@@ -73,15 +76,16 @@
  build $obj/source_lua/linit.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/linit.c
  build $obj/source_lua/onelua.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/onelua.c
  rule cxx_source_bootstrap
--  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
-+  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
--    -DNDEBUG -fPIC -o $out -c $in
-+    -DNDEBUG -o $out -c $in CXXFLAGS
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $
+-    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
++    -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $
++    -DLUA_USE_LINUX -DNDEBUG -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -99,7 +99,7 @@
+@@ -100,7 +100,7 @@
      3rd/bee.lua/bootstrap/progdir.cpp
  rule link_luamake
    command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $

diff --git a/dev-util/lua-language-server/lua-language-server-3.6.7.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.8.ebuild
similarity index 100%
rename from dev-util/lua-language-server/lua-language-server-3.6.7.ebuild
rename to dev-util/lua-language-server/lua-language-server-3.6.8.ebuild


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-util/lua-language-server/, dev-util/lua-language-server/files/
@ 2023-02-08 12:09 Florian Schmaus
  0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-02-08 12:09 UTC (permalink / raw
  To: gentoo-commits

commit:     c3542d60dcdcbd0bce6ad2d795472ca28413dd86
Author:     Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
AuthorDate: Tue Feb  7 16:12:37 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 16:12:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c3542d60

dev-util/lua-language-server: add 3.6.10, drop 3.6.8

Signed-off-by: Mathis Winterer <mrmagic223325 <AT> fedora.email>

 dev-util/lua-language-server/Manifest              |  2 +-
 .../lua-language-server/files/build.ninja.patch    | 51 +++++++++++++++++++---
 ....8.ebuild => lua-language-server-3.6.10.ebuild} |  4 +-
 dev-util/lua-language-server/metadata.xml          |  9 ++--
 4 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 7967eaa88..dbfbf1d8e 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1 +1 @@
-DIST lua-language-server-3.6.8.zip 389244327 BLAKE2B 67299716586bd01f2fc48319b68319b48090b87d8f4c72b79c52022af39140490983edfd1145d88616c1fabcb7f6a62bed8defbab7a8f4fe3330176812994a58 SHA512 bf5633e7570fa44d62bb5a2e4414d4f0e197fcef3b1a9876ea90cf37a79ae17afaaecdc5d54917cc7fb44e01b7db34abd6329cef0df4e3207177a0a6a8ec54f2
+DIST lua-language-server-3.6.10.zip 31998049 BLAKE2B 8c15c583c947cea7647d40fc82114c2f4ec4d1025377ce796b002f3761137e6499feccb934b5b5f0466d2f612b4801dc2ba7e6984027527b5c2174d6895d15ce SHA512 a49c28990e00115eaac83e615079192adfd39655436babc86dafe3660912c10346ab99c418272ac4a9c2113a98921b9b07c0c20bdf62fe633872417127247509

diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
index 11db385d3..d0ccda1a5 100644
--- a/dev-util/lua-language-server/files/build.ninja.patch
+++ b/dev-util/lua-language-server/files/build.ninja.patch
@@ -1,6 +1,6 @@
 --- a/build/build.ninja
 +++ b/build/build.ninja
-@@ -12,18 +12,18 @@
+@@ -13,18 +13,18 @@
      3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $
      make/code_format.lua
  rule c_source_bee
@@ -24,7 +24,7 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -31,8 +31,8 @@
+@@ -32,8 +32,8 @@
      3rd/bee.lua/bee/nonstd/fmt/format.cc
  build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc
  rule cxx_source_bee_1
@@ -35,7 +35,7 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -56,9 +56,9 @@
+@@ -57,9 +57,9 @@
  build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
      3rd/bee.lua/bee/utility/path_helper.cpp
  rule cxx_source_bee_2
@@ -48,9 +48,9 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -79,26 +79,26 @@
- build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
-     3rd/bee.lua/binding/lua_time.cpp
+@@ -82,26 +82,26 @@
+ build $obj/source_bee/luaref.obj: cxx_source_bee_2 $
+     3rd/bee.lua/binding/luaref.cpp
  rule c_source_lua
 -  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $
 -    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
@@ -83,7 +83,7 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -108,7 +108,7 @@
+@@ -111,7 +111,7 @@
      3rd/bee.lua/bootstrap/progdir.cpp
  rule link_bootstrap
    command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $
@@ -92,3 +92,40 @@
    description = Link    Exe $out
  build /bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
      $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $
+@@ -149,10 +149,10 @@
+     3rd/bee.lua/test/test_thread.lua 3rd/bee.lua/test/test_time.lua | $
+     /bootstrap copy_script
+ rule cxx_code_format
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
+     -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/include $
+     -I3rd/bee.lua/3rd/lua -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include $
+-    -DNDEBUG -Wall -Werror -o $out -c $in
++    -DNDEBUG -Wall -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -245,9 +245,9 @@
+ build $obj/code_format/Utf8.obj: cxx_code_format $
+     3rd/EmmyLuaCodeStyle/Util/src/Utf8.cpp
+ rule c_lpeglabel
+-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
++  command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $
+     -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
+-    -o $out -c $in
++    -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+@@ -257,9 +257,9 @@
+ build $obj/lpeglabel/lpltree.obj: c_lpeglabel 3rd/lpeglabel/lpltree.c
+ build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
+ rule cxx_lua_language_server
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
+     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
+-    -DNDEBUG -o $out -c $in
++    -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d

diff --git a/dev-util/lua-language-server/lua-language-server-3.6.8.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.10.ebuild
similarity index 90%
rename from dev-util/lua-language-server/lua-language-server-3.6.8.ebuild
rename to dev-util/lua-language-server/lua-language-server-3.6.10.ebuild
index b4a2bfe1e..47618e68a 100644
--- a/dev-util/lua-language-server/lua-language-server-3.6.8.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.6.10.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 inherit ninja-utils toolchain-funcs
 
 DESCRIPTION="Lua language server"
-HOMEPAGE="https://github.com/sumneko/lua-language-server"
-SRC_URI="https://github.com/sumneko/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
+HOMEPAGE="https://github.com/LuaLS/lua-language-server"
+SRC_URI="https://github.com/LuaLS/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
 S="${WORKDIR}"
 
 LICENSE="MIT"

diff --git a/dev-util/lua-language-server/metadata.xml b/dev-util/lua-language-server/metadata.xml
index 6253e3a9c..598098e82 100644
--- a/dev-util/lua-language-server/metadata.xml
+++ b/dev-util/lua-language-server/metadata.xml
@@ -9,11 +9,8 @@
 		The Lua language server provides various language features for Lua to make development easier and faster. With around half a million installs on Visual Studio Code, it is the most popular extension for Lua language support. Supports Lua versions 5.1, 5.2, 5.3, 5.4 and LuaJIT
 	</longdescription>
 	<upstream>
-		<maintainer status="active">
-			<name>Sumneko</name>
-		</maintainer>
-		<bugs-to>https://github.com/sumneko/lua-language-server/issues</bugs-to>
-		<doc>https://github.com/sumneko/lua-language-server/wiki</doc>
-		<remote-id type="github">sumneko/lua-language-server</remote-id>
+		<bugs-to>https://github.com/LuaLS/lua-language-server/issues</bugs-to>
+		<doc>https://github.com/LuaLS/lua-language-server/wiki</doc>
+		<remote-id type="github">LuaLS/lua-language-server</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: dev-util/lua-language-server/, dev-util/lua-language-server/files/
@ 2023-03-08  9:08 Florian Schmaus
  0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-03-08  9:08 UTC (permalink / raw
  To: gentoo-commits

commit:     ebc24c52e73c461508896673d8a6837ccdd84202
Author:     Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
AuthorDate: Tue Mar  7 20:27:50 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 20:27:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ebc24c52

dev-util/lua-language-server: new package, add 3.6.13

Signed-off-by: Mathis Winterer <mrmagic223325 <AT> fedora.email>

 dev-util/lua-language-server/Manifest              |  2 +-
 .../lua-language-server/files/build.ninja.patch    | 45 +++++++--------
 .../lua-language-server/files/linux.ninja.patch    | 61 ++++++++++----------
 .../lua-language-server-3.6.13.ebuild              | 67 ++++++++++++++++++++++
 4 files changed, 118 insertions(+), 57 deletions(-)

diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 8adf5fd2e..b5ca763a9 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1 +1 @@
-DIST lua-language-server-3.6.11.zip 32022639 BLAKE2B 9e5a33b12e40f8b9f7b3eb5a8b049e09e8a7f0b5a5569ee15d5aa2a2035a13a6e75036321aac439a97c56c401914908f878e2f02a136c1de9413f2a9879a56c1 SHA512 6474ad8c84af034002e124a802a28afccb7f7ea439b00b508639a4a20471b5eed995dacf12fe0c8cb2313530fba787fa1127712093402e4e67c7d72e5118ce59
+DIST lua-language-server-3.6.13.zip 30691495 BLAKE2B 376b5f792d1002a0b1e0942e4d91aed4bbdccc5cf033cad56e9fafc6df3a5ef28247fc611c2563c6b3c499e491699bf6f21edc9ac6106440a7dc4662803f8aee SHA512 ce595dfe2e16bb468e90c2e73d5569eeac2cf093a0caaa0006e23ec876edcf491be92dad88e35369f9c250949c887850e8c1805736e8b8f20b0c643a56d6faed

diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
index d0ccda1a5..5bd6ac190 100644
--- a/dev-util/lua-language-server/files/build.ninja.patch
+++ b/dev-util/lua-language-server/files/build.ninja.patch
@@ -1,6 +1,6 @@
 --- a/build/build.ninja
 +++ b/build/build.ninja
-@@ -13,18 +13,18 @@
+@@ -12,17 +12,17 @@
      3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $
      make/code_format.lua
  rule c_source_bee
@@ -8,7 +8,7 @@
 +  command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $
      -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I$builddir/lua54 $
 -    -DNDEBUG -fPIC -o $out -c $in
-+    -DNDEBUG -o $out -c $in CFLAGS
++    -DNDEBUG -fPIC -o $out -c $in CFLAGS
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
@@ -16,26 +16,24 @@
      3rd/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 $
--    -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $
--    $out -c $in
+-    -Werror -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
-+    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $
-+    $out -c $in CXXFLAGS
++    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -32,8 +32,8 @@
-     3rd/bee.lua/bee/nonstd/fmt/format.cc
- build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc
+@@ -30,8 +30,8 @@
+     3rd/bee.lua/bee/nonstd/3rd/format.cc
+ build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/3rd/os.cc
  rule cxx_source_bee_1
 -  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
 -    -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
-+    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS
++    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -57,9 +57,9 @@
+@@ -55,9 +55,9 @@
  build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
      3rd/bee.lua/bee/utility/path_helper.cpp
  rule cxx_source_bee_2
@@ -44,18 +42,18 @@
 -    -I$builddir/lua54 -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
 +    -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
-+    -I$builddir/lua54 -DBEE_STATIC -DNDEBUG -o $out -c $in CXXFLAGS
++    -I$builddir/lua54 -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -82,26 +82,26 @@
- build $obj/source_bee/luaref.obj: cxx_source_bee_2 $
-     3rd/bee.lua/binding/luaref.cpp
+@@ -78,26 +78,26 @@
+ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
+     3rd/bee.lua/binding/lua_time.cpp
  rule c_source_lua
 -  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $
 -    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $
-+    -fvisibility=hidden -DNDEBUG -o $out -c $in CFLAGS
++    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CFLAGS
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
@@ -63,10 +61,9 @@
      3rd/bee.lua/3rd/lua/utf8_crt.c
  rule c_source_lua_1
 -  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $
--    -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $
--    $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $
-+    -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -o $
+     -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $
+-    $out -c $in
 +    $out -c $in CFLAGS
    description = Compile C   $out
    deps = gcc
@@ -79,11 +76,11 @@
 -    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
 +    -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $
-+    -DLUA_USE_LINUX -DNDEBUG -o $out -c $in CXXFLAGS
++    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -111,7 +111,7 @@
+@@ -107,7 +107,7 @@
      3rd/bee.lua/bootstrap/progdir.cpp
  rule link_bootstrap
    command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $
@@ -92,7 +89,7 @@
    description = Link    Exe $out
  build /bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
      $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $
-@@ -149,10 +149,10 @@
+@@ -145,10 +145,10 @@
      3rd/bee.lua/test/test_thread.lua 3rd/bee.lua/test/test_time.lua | $
      /bootstrap copy_script
  rule cxx_code_format
@@ -105,7 +102,7 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -245,9 +245,9 @@
+@@ -243,9 +243,9 @@
  build $obj/code_format/Utf8.obj: cxx_code_format $
      3rd/EmmyLuaCodeStyle/Util/src/Utf8.cpp
  rule c_lpeglabel
@@ -117,7 +114,7 @@
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
-@@ -257,9 +257,9 @@
+@@ -255,9 +255,9 @@
  build $obj/lpeglabel/lpltree.obj: c_lpeglabel 3rd/lpeglabel/lpltree.c
  build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
  rule cxx_lua_language_server

diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch
index 3be7fba75..7068459ab 100644
--- a/dev-util/lua-language-server/files/linux.ninja.patch
+++ b/dev-util/lua-language-server/files/linux.ninja.patch
@@ -1,6 +1,6 @@
 --- a/3rd/luamake/compile/ninja/linux.ninja
 +++ b/3rd/luamake/compile/ninja/linux.ninja
-@@ -2,21 +2,21 @@
+@@ -2,20 +2,20 @@
  builddir = build/linux
  bin = $builddir/bin
  obj = $builddir/obj
@@ -10,83 +10,80 @@
  rule c_source_bee
 -  command = $cc -MMD -MT $out -MF $out.d  -O2 -Wall -Werror $
 +  command = $cc -MMD -MT $out -MF $out.d -Wall $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -Itools/lua54 -DNDEBUG $
--    -fPIC -o $out -c $in
+     -fvisibility=hidden -Ibee.lua/3rd/lua-seri -Itools/lua54 -DNDEBUG -fPIC $
+-    -o $out -c $in
 +    -o $out -c $in CFLAGS
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
  build $obj/source_bee/lua-seri.obj: c_source_bee $
-     3rd/bee.lua/3rd/lua-seri/lua-seri.c
+     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 $
--    -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -fPIC -o $
--    $out -c $in
+-    -Werror -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
-+    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $
-+    $out -c $in CXXFLAGS
++    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -24,8 +24,8 @@
-     3rd/bee.lua/bee/nonstd/fmt/format.cc
- build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc
+@@ -23,8 +23,8 @@
+     bee.lua/bee/nonstd/3rd/format.cc
+ build $obj/source_bee/os.obj: cxx_source_bee bee.lua/bee/nonstd/3rd/os.cc
  rule cxx_source_bee_1
 -  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
--    -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
+-    -Werror -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
-+    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS
++    -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -49,9 +49,9 @@
+@@ -47,9 +47,9 @@
  build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
-     3rd/bee.lua/bee/utility/path_helper.cpp
+     bee.lua/bee/utility/path_helper.cpp
  rule cxx_source_bee_2
 -  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
--    -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
+-    -Werror -fvisibility=hidden -Ibee.lua/3rd/lua-seri -Ibee.lua $
 -    -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
-+    -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
-+    -Itools/lua54 -DBEE_STATIC -DNDEBUG -o $out -c $in CXXFLAGS
++    -fvisibility=hidden -Ibee.lua/3rd/lua-seri -Ibee.lua $
++    -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -72,25 +72,25 @@
+@@ -70,24 +70,24 @@
  build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
-     3rd/bee.lua/binding/lua_time.cpp
+     bee.lua/binding/lua_time.cpp
  rule c_source_lua
 -  command = $cc -MMD -MT $out -MF $out.d  -O2 -Wall -Werror $
 -    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -Wall $
-+    -fvisibility=hidden -DNDEBUG -o $out -c $in CFLAGS
++    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CFLAGS
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
- build $obj/source_lua/utf8_crt.obj: c_source_lua $
-     3rd/bee.lua/3rd/lua/utf8_crt.c
+ 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  -O2 -Wall -Werror -DMAKE_LIB $
 -    -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -Wall -DMAKE_LIB $
-+    -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -o $out -c $in CFLAGS
++    -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in CFLAGS
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
- build $obj/source_lua/linit.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/linit.c
- build $obj/source_lua/onelua.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/onelua.c
+ build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
+ build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
  rule cxx_source_bootstrap
 -  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
--    -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $
--    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in
+-    -Werror -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
+-    -DNDEBUG -fPIC -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
-+    -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $
-+    -DLUA_USE_LINUX -DNDEBUG -o $out -c $in CXXFLAGS
++    -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
++    -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -100,7 +100,7 @@
-     3rd/bee.lua/bootstrap/progdir.cpp
+@@ -97,7 +97,7 @@
+     bee.lua/bootstrap/progdir.cpp
  rule link_luamake
    command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $
 -    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -static-libgcc -s

diff --git a/dev-util/lua-language-server/lua-language-server-3.6.13.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.13.ebuild
new file mode 100644
index 000000000..823cceb46
--- /dev/null
+++ b/dev-util/lua-language-server/lua-language-server-3.6.13.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit ninja-utils toolchain-funcs
+
+DESCRIPTION="Lua language server"
+HOMEPAGE="https://github.com/LuaLS/lua-language-server"
+SRC_URI="https://github.com/LuaLS/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+BDPEND="
+	${NINJA_DEPEND}
+	app-arch/unzip
+	dev-util/ninja
+"
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/linux.ninja.patch" "${FILESDIR}/build.ninja.patch" )
+
+src_prepare() {
+	# Remove hardcoded gcc references
+	sed -i "/lm.cxx/a lm.cc = '$(tc-getCC)'" \
+		make.lua || die
+	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
+		3rd/lpeglabel/makefile || die
+	# Shipped file doesn't respect CFLAGS/CXXFLAGS
+	eapply "${FILESDIR}/linux.ninja.patch"
+	eapply_user
+	sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
+		-e "s/CFLAGS/${CFLAGS}/" \
+		-e "s/CXXFLAGS/${CXXFLAGS}/" \
+		-e "s/LDFLAGS/${LDFLAGS}/" \
+		3rd/luamake/compile/ninja/linux.ninja || die
+}
+
+src_compile() {
+	eninja -C 3rd/luamake -f compile/ninja/linux.ninja "$(usex test "test" "luamake")"
+	use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
+	./3rd/luamake/luamake init || die
+
+	# Generated file doesn't respect CFLAGS/CXXFLAGS
+	sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \
+		-e "s/^luamake =.*./luamake = LUAMAKE_PATH/" \
+		build/build.ninja || die
+
+	eapply "${FILESDIR}/build.ninja.patch"
+	sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \
+		-e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \
+		-e "s/CFLAGS/${CFLAGS}/" \
+		-e "s/CXXFLAGS/${CXXFLAGS}/" \
+		-e "s/LDFLAGS/${LDFLAGS}/" \
+		-e "7d" \
+		build/build.ninja || die
+
+	# Tests are broken
+	eninja -f build/build.ninja all
+}
+
+src_install() {
+	dobin ./bin/{main.lua,lua-language-server}
+	dodoc changelog.md README.md
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-03-08  9:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-08 12:09 [gentoo-commits] repo/proj/guru:master commit in: dev-util/lua-language-server/, dev-util/lua-language-server/files/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2023-03-08  9:08 Florian Schmaus
2023-02-01 21:36 Viorel Munteanu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox