public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-util/lua-language-server/, dev-util/lua-language-server/files/
Date: Wed,  8 Mar 2023 09:08:34 +0000 (UTC)	[thread overview]
Message-ID: <1678220870.ebc24c52e73c461508896673d8a6837ccdd84202.flow@gentoo> (raw)

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
+}


             reply	other threads:[~2023-03-08  9:08 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-08  9:08 Florian Schmaus [this message]
  -- strict thread matches above, loose matches on Subject: below --
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
2023-02-01 21:36 Viorel Munteanu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1678220870.ebc24c52e73c461508896673d8a6837ccdd84202.flow@gentoo \
    --to=flow@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox