From: "Mathis Winterer" <mrmagic223325@fedora.email>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-util/lua-language-server/files/, dev-util/lua-language-server/
Date: Thu, 19 Jan 2023 20:14:07 +0000 (UTC) [thread overview]
Message-ID: <1674158984.358ab9012ee99f716417959bbd77384cbae2c3c2.mrmagic223325@gentoo> (raw)
commit: 358ab9012ee99f716417959bbd77384cbae2c3c2
Author: Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
AuthorDate: Thu Jan 19 20:09:44 2023 +0000
Commit: Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
CommitDate: Thu Jan 19 20:09:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=358ab901
dev-util/lua-language-server: add 3.6.6, drop 3.6.4
Signed-off-by: Mathis Winterer <mrmagic223325 <AT> fedora.email>
dev-util/lua-language-server/Manifest | 2 +-
.../lua-language-server/files/build.ninja.patch | 83 ++++++++--------------
.../lua-language-server/files/linux.ninja.patch | 36 +++++-----
...6.4.ebuild => lua-language-server-3.6.6.ebuild} | 18 ++---
4 files changed, 59 insertions(+), 80 deletions(-)
diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 7144f1ceb..98fa5f139 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1 +1 @@
-DIST lua-language-server-3.6.4.zip 32188348 BLAKE2B 4d249af12cdf151d77b7af1c63cff2de103d7cf80416422bf3cf9fbb6031546963f59dcf1d39f8b8dbe41a3cde29dbdf04ba9fc5760cb310575ebdc0494ec604 SHA512 9f47becc9ade0f205d28ad75abeb5895b06486a21c3afa2b16331c34db25fce70a20a80599f48aa0ba485bad75316e1c0d4080f8bb49eaeb30ccc6eff7b12d13
+DIST lua-language-server-3.6.6.zip 32324475 BLAKE2B 240149ac50a7024f4135d9ad25246058e7160ebee8cf2613b65ba25bc44fdd65101763fbcbfce12c666927200ec64887783ad16d0daccc326177d168334189df SHA512 4dc60fe7bfbf17df1bdac2566fc8bdb16750cf8ea0220ba3c3eb787baa544f79f7fa3d08f519b45b5143cc793f2fe2063ef46a7ba3f3b0d2069d1bd8f72cc83b
diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
index d736f3619..3760f9367 100644
--- a/dev-util/lua-language-server/files/build.ninja.patch
+++ b/dev-util/lua-language-server/files/build.ninja.patch
@@ -1,23 +1,13 @@
--- a/build/build.ninja
+++ b/build/build.ninja
-@@ -2,7 +2,7 @@
- builddir = build
- bin = bin
- obj = $builddir/obj
--cc = x86_64-pc-linux-gnu-gcc
-+cc = REPLACE_ME
- luamake = $
- /var/tmp/portage/dev-util/lua-language-server-3.6.4/work/3rd/luamake/luamake
- rule configure
-@@ -13,17 +13,17 @@
+@@ -12,17 +12,17 @@
3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $
make/code_format.lua
rule c_source_bee
- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $
-- -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I$builddir/lua54 $
++ 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
-+ command = $cc -MMD -MT $out -MF $out.d -std=c11 $
-+ -I3rd/bee.lua/3rd/lua-seri -I$builddir/lua54 $
+ -DNDEBUG -o $out -c $in CFLAGS
description = Compile C $out
deps = gcc
@@ -27,43 +17,42 @@
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 $
-+ -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $out -c $in CXXFLAGS
++ 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
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -31,8 +31,8 @@
+@@ -30,8 +30,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 $
-+ -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS
++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
++ -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -56,9 +56,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
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
-- -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
+ -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 $
-+ -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
-@@ -79,26 +79,26 @@
+@@ -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 $
-+ -DNDEBUG -o $out -c $in CFLAGS
++ command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $
++ -fvisibility=hidden -DNDEBUG -o $out -c $in CFLAGS
description = Compile C $out
deps = gcc
depfile = $out.d
@@ -73,8 +62,8 @@
- 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 $
-+ -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -o $
++ command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $
++ -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -o $
+ $out -c $in CFLAGS
description = Compile C $out
deps = gcc
@@ -83,15 +72,14 @@
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 $
-- -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
++ 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
-+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
-+ -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
-@@ -108,7 +108,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 $
@@ -100,43 +88,34 @@
description = Link Exe $out
build /bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
$obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $
-@@ -146,10 +146,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
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
-- -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/include $
-+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
-+ -I3rd/EmmyLuaCodeStyle/include $
++ 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 -o $out -c $in CXXFLAGS
++ -DNDEBUG -Wall -o $out -c $in CXXFLAGS
description = Compile C++ $out
deps = gcc
depfile = $out.d
-@@ -274,9 +274,9 @@
+@@ -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 $
-- -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
-- -o $out -c $in
-+ command = $cc -MMD -MT $out -MF $out.d -std=c11 $
-+ -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
-+ -o $out -c $in CFLAGS
++ 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
- deps = gcc
- depfile = $out.d
-@@ -286,9 +286,9 @@
+@@ -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 $
-- -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
-- -DNDEBUG -o $out -c $in
-+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
-+ -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
-+ -DNDEBUG -o $out -c $in CXXFLAGS
++ 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
- deps = gcc
- depfile = $out.d
diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch
index b5dbb5348..a16055fd7 100644
--- a/dev-util/lua-language-server/files/linux.ninja.patch
+++ b/dev-util/lua-language-server/files/linux.ninja.patch
@@ -9,10 +9,9 @@
luamake = luamake
rule c_source_bee
- command = $cc -MMD -MT $out -MF $out.d -O2 -Wall -Werror $
-- -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -Itools/lua54 -DNDEBUG $
++ 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
-+ command = $cc -MMD -MT $out -MF $out.d $
-+ -I3rd/bee.lua/3rd/lua-seri -Itools/lua54 -DNDEBUG $
+ -o $out -c $in CFLAGS
description = Compile C $out
deps = gcc
@@ -22,8 +21,8 @@
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 $
-+ -I3rd/bee.lua/bee/nonstd -DNDEBUG -o $out -c $in CXXFLAGS
++ 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
description = Compile C++ $out
deps = gcc
depfile = $out.d
@@ -33,8 +32,8 @@
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 $
-+ -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS
++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
++ -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in CXXFLAGS
description = Compile C++ $out
deps = gcc
depfile = $out.d
@@ -43,22 +42,21 @@
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 $
-- -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
++ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
+ -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 $
-+ -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,24 +71,24 @@
+@@ -71,25 +71,25 @@
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 -O2 -Wall -Werror $
- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
-+ command = $cc -MMD -MT $out -MF $out.d $
-+ -DNDEBUG -o $out -c $in CFLAGS
++ command = $cc -MMD -MT $out -MF $out.d -Wall $
++ -fvisibility=hidden -DNDEBUG -o $out -c $in CFLAGS
description = Compile C $out
deps = gcc
depfile = $out.d
@@ -67,23 +65,23 @@
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 -DMAKE_LIB $
-+ -DLUA_USE_LINUX -DNDEBUG -o $out -c $in CFLAGS
++ command = $cc -MMD -MT $out -MF $out.d -Wall -DMAKE_LIB $
++ -DLUA_USE_LINUX -DNDEBUG -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
rule cxx_source_bootstrap
- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
-- -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
++ 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
-+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
-+ -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
-@@ -98,7 +98,7 @@
+@@ -99,7 +99,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.4.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.6.ebuild
similarity index 82%
rename from dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
rename to dev-util/lua-language-server/lua-language-server-3.6.6.ebuild
index 1284b7e95..b4a2bfe1e 100644
--- a/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.6.6.ebuild
@@ -20,7 +20,7 @@ BDPEND="
dev-util/ninja
"
RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}/linux.ninja.patch" )
+PATCHES=( "${FILESDIR}/linux.ninja.patch" "${FILESDIR}/build.ninja.patch" )
src_prepare() {
# Remove hardcoded gcc references
@@ -28,9 +28,9 @@ src_prepare() {
make.lua || die
sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
3rd/lpeglabel/makefile || die
- # Patch
- default
# 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}/" \
@@ -43,16 +43,18 @@ src_compile() {
use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
./3rd/luamake/luamake init || die
- eapply "${FILESDIR}/build.ninja.patch"
-
- sed -i "s/^cc = gcc/cc = $(tc-getCC)/" \
+ # 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
- # Generated file doesn't respect CFLAGS/CXXFLAGS
- sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
+ 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
next reply other threads:[~2023-01-19 20:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 20:14 Mathis Winterer [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-19 20:46 [gentoo-commits] repo/proj/guru:dev commit in: dev-util/lua-language-server/files/, dev-util/lua-language-server/ Brahmajit Das
2024-05-29 23:01 Brahmajit Das
2024-05-27 16:36 Brahmajit Das
2023-04-27 17:16 Mathis Winterer
2023-03-28 13:51 Mathis Winterer
2023-03-13 22:02 Mathis Winterer
2023-01-01 23:08 Mathis Winterer
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=1674158984.358ab9012ee99f716417959bbd77384cbae2c3c2.mrmagic223325@gentoo \
--to=mrmagic223325@fedora.email \
--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