diff options
author | mr_magic223325 <mrmagic223325@fedora.email> | 2023-07-26 14:57:12 +0200 |
---|---|---|
committer | Mathis Winterer <mrmagic223325@fedora.email> | 2023-07-26 14:57:12 +0200 |
commit | fee742576e30c8609ae293aa20327868d8934b8a (patch) | |
tree | 6da602ec915630163e8a4235d375ced76b66ef3f /dev-util/lua-language-server | |
parent | media-video/kikoplay: drop 0.8.2 (diff) | |
download | guru-fee742576e30c8609ae293aa20327868d8934b8a.tar.gz guru-fee742576e30c8609ae293aa20327868d8934b8a.tar.bz2 guru-fee742576e30c8609ae293aa20327868d8934b8a.zip |
dev-util/lua-language-server: add 3.6.25, drop 3.6.23
Signed-off-by: Mathis Winterer <mrmagic223325@fedora.email>
Diffstat (limited to 'dev-util/lua-language-server')
-rw-r--r-- | dev-util/lua-language-server/Manifest | 2 | ||||
-rw-r--r-- | dev-util/lua-language-server/files/build.ninja.patch | 58 | ||||
-rw-r--r-- | dev-util/lua-language-server/files/linux.ninja.patch | 69 | ||||
-rw-r--r-- | dev-util/lua-language-server/lua-language-server-3.6.25.ebuild (renamed from dev-util/lua-language-server/lua-language-server-3.6.23.ebuild) | 5 |
4 files changed, 57 insertions, 77 deletions
diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest index 1a84e7062..c6fe53c19 100644 --- a/dev-util/lua-language-server/Manifest +++ b/dev-util/lua-language-server/Manifest @@ -1 +1 @@ -DIST lua-language-server-3.6.23.zip 31241611 BLAKE2B 59ead98e1c95170f7739e5b8812dd3d7db9de8e101e90feee70cb55996b09dfc2aac64be8c9b0349b9b78fa93958b25ca7abba0aa3b12690f3a064ddc60b2364 SHA512 1c69ffd08fa8c7e8a93d3373080e79228a38544776dc41af7b4fbea011d8d6194d75111ce9edac0ef15563316486b95f345b3a8b0cfa762c770258b21ef66f7a +DIST lua-language-server-3.6.25.zip 31287196 BLAKE2B 0035e231cfa46035c227a8803e426e6ac294245b961ffb5957d0ce716c44bdeee8c54df17e6789bef1c3cee7c11bc7b731ff4f23e58f2008c16c1f4e87f3f778 SHA512 13e12c84330df4d85c2b1dcdcd7af945bebe2fd2d35df0f591e6e73e780982ba3b4902538011f52ea732e3ceca2c5ebdea560697d2d79df3570dcf93b3456005 diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch index 8f83ef7eb..bb9891e2d 100644 --- a/dev-util/lua-language-server/files/build.ninja.patch +++ b/dev-util/lua-language-server/files/build.ninja.patch @@ -1,21 +1,19 @@ --- a/build/build.ninja +++ b/build/build.ninja -@@ -12,8 +12,8 @@ - 3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $ +@@ -14,7 +14,7 @@ make/code_format.lua rule c_source_bee -- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $ + command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ - -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $ + -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS description = Compile C $out deps = gcc depfile = $out.d -@@ -21,14 +21,14 @@ +@@ -22,14 +22,14 @@ 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 -DNDEBUG -fPIC -o $out -c $in +- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in + -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc @@ -23,56 +21,48 @@ build $obj/source_bee/format.obj: cxx_source_bee 3rd/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 $ -- -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in +- -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in + -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -61,8 +61,8 @@ - 3rd/bee.lua/bee/utility/path_helper.cpp +@@ -65,7 +65,7 @@ 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 -I$builddir/lua54 $ -- -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in -+ -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 $ -+ -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in CXXFLAGS + -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 -DBEE_STATIC $ +- -DNDEBUG -fPIC -o $out -c $in ++ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -83,17 +83,17 @@ - build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $ +@@ -87,7 +87,7 @@ 3rd/bee.lua/binding/lua_time.cpp rule c_source_lua -- command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $ + command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ - -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ + -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 $ +@@ -95,7 +95,7 @@ 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 $ -+ 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 -+ $out -c $in CFLAGS + 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 ++ -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in CFLAGS description = Compile C $out deps = gcc depfile = $out.d -@@ -101,8 +101,8 @@ - build $obj/source_lua/onelua.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/onelua.c +@@ -104,7 +104,7 @@ 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 -+ -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $ -+ -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in CXXFLAGS + -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.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 -@@ -110,7 +110,7 @@ +@@ -112,7 +112,7 @@ 3rd/bee.lua/bootstrap/main.cpp rule link_bootstrap command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $ @@ -81,7 +71,7 @@ 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 $ -@@ -152,8 +152,8 @@ +@@ -155,8 +155,8 @@ -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $ -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $ -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua $ @@ -92,7 +82,7 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -256,7 +256,7 @@ +@@ -259,7 +259,7 @@ 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 $ @@ -101,7 +91,7 @@ description = Compile C $out deps = gcc depfile = $out.d -@@ -268,7 +268,7 @@ +@@ -271,7 +271,7 @@ 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 $ @@ -110,7 +100,7 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -276,7 +276,7 @@ +@@ -279,7 +279,7 @@ make/modules.cpp rule link_lua_language_server command = $cc $in -o $out -lm -ldl -lstdc++fs -pthread -Wl,-Bstatic $ diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch index fe2d89f61..c45d29051 100644 --- a/dev-util/lua-language-server/files/linux.ninja.patch +++ b/dev-util/lua-language-server/files/linux.ninja.patch @@ -1,90 +1,79 @@ --- a/3rd/luamake/compile/ninja/linux.ninja +++ b/3rd/luamake/compile/ninja/linux.ninja -@@ -2,26 +2,26 @@ +@@ -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 -O2 -Wall -Werror $ + command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ - -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -Wall $ + -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS description = Compile C $out deps = gcc depfile = $out.d - build $obj/source_bee/lua-seri.obj: c_source_bee $ +@@ -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 $ -- -Werror -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ + 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 $ -- -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 $ + 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 -@@ -46,9 +46,9 @@ - build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $ - bee.lua/bee/utility/path_helper.cpp +@@ -57,7 +57,7 @@ rule cxx_source_bee_2 -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -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 -Ibee.lua -Itools/lua54 -DBEE_STATIC $ -+ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS + 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 -@@ -69,24 +69,24 @@ - build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $ - bee.lua/binding/lua_time.cpp +@@ -80,14 +80,14 @@ 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 -fPIC -o $out -c $in CFLAGS - description = Compile C $out + 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 -O2 -Wall -Werror -DMAKE_LIB $ -- -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -Wall -DMAKE_LIB $ -+ -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $out -c $in CFLAGS - description = Compile C $out + 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 - build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c +@@ -95,7 +95,7 @@ rule cxx_source_bootstrap -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $ + 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 -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ -+ -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 -@@ -96,7 +96,7 @@ - bee.lua/bootstrap/progdir.cpp +@@ -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_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $ + $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ diff --git a/dev-util/lua-language-server/lua-language-server-3.6.23.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.25.ebuild index 7defc27b0..c9b9fbf32 100644 --- a/dev-util/lua-language-server/lua-language-server-3.6.23.ebuild +++ b/dev-util/lua-language-server/lua-language-server-3.6.25.ebuild @@ -37,6 +37,7 @@ src_prepare() { eapply "${FILESDIR}/linux.ninja.patch" eapply_user sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \ + -e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \ -e "s/CFLAGS/${CFLAGS}/" \ -e "s/CXXFLAGS/${CXXFLAGS}/" \ -e "s/LDFLAGS/${LDFLAGS}/" \ @@ -52,16 +53,16 @@ src_compile() { # Generated file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \ - -e "s/^luamake =.*./luamake = LUAMAKE_PATH/" \ + -e "s/^ar =.*./ar = REPLACE_AR/" \ build/build.ninja || die eapply "${FILESDIR}/build.ninja.patch" sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \ + -e "s/REPLACE_AR/$(tc-getAR)/" \ -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 use test && eninja -f build/build.ninja || eninja -f build/build.ninja all |