diff options
Diffstat (limited to 'dev-util/lua-language-server/files')
4 files changed, 17 insertions, 208 deletions
diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch index bb9891e2d04d..5485c318636d 100644 --- a/dev-util/lua-language-server/files/build.ninja.patch +++ b/dev-util/lua-language-server/files/build.ninja.patch @@ -1,4 +1,4 @@ ---- a/build/build.ninja +--- b/build/build.ninja +++ b/build/build.ninja @@ -14,7 +14,7 @@ make/code_format.lua @@ -35,21 +35,12 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -87,7 +87,7 @@ - 3rd/bee.lua/binding/lua_time.cpp +@@ -94,7 +94,7 @@ + 3rd/bee.lua/binding/luaref.cpp rule c_source_lua - command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ -- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in -+ -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CFLAGS - description = Compile C $out - deps = gcc - depfile = $out.d -@@ -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 -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 +- -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in ++ -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in CFLAGS description = Compile C $out deps = gcc depfile = $out.d diff --git a/dev-util/lua-language-server/files/build.ninja_v2.patch b/dev-util/lua-language-server/files/build.ninja_v2.patch deleted file mode 100644 index 5485c318636d..000000000000 --- a/dev-util/lua-language-server/files/build.ninja_v2.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- b/build/build.ninja -+++ b/build/build.ninja -@@ -14,7 +14,7 @@ - make/code_format.lua - rule c_source_bee - command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ -- -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in -+ -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS - description = Compile C $out - deps = gcc - depfile = $out.d -@@ -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 $ -- -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 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 $ -- -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 -@@ -65,7 +65,7 @@ - rule cxx_source_bee_2 - command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ - -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 -@@ -94,7 +94,7 @@ - 3rd/bee.lua/binding/luaref.cpp - rule c_source_lua - command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $ -- -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in -+ -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in CFLAGS - description = Compile C $out - deps = gcc - depfile = $out.d -@@ -104,7 +104,7 @@ - rule cxx_source_bootstrap - command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ - -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 -@@ -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 $ -- -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 $ -@@ -155,8 +155,8 @@ - -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $ - -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $ - -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua $ -- -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -Werror -o $ -- $out -c $in -+ -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -o $ -+ $out -c $in CXXFLAGS - description = Compile C++ $out - deps = gcc - depfile = $out.d -@@ -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 $ -- -o $out -c $in -+ -o $out -c $in CFLAGS - description = Compile C $out - deps = gcc - depfile = $out.d -@@ -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 $ -- -DNDEBUG -o $out -c $in -+ -DNDEBUG -o $out -c $in CXXFLAGS - description = Compile C++ $out - deps = gcc - depfile = $out.d -@@ -279,7 +279,7 @@ - make/modules.cpp - rule link_lua_language_server - command = $cc $in -o $out -lm -ldl -lstdc++fs -pthread -Wl,-Bstatic $ -- -lstdc++ -Wl,-Bdynamic -s -+ -lstdc++ -Wl,-Bdynamic LDFLAGS - description = Link Exe $out - build $bin/lua-language-server: link_lua_language_server $ - $obj/lua-language-server/modules.obj $obj/lpeglabel/lplcap.obj $ diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch index 4fedbaccc2dc..b4eba4b75e19 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,12 +2,12 @@ +@@ -2,12 +2,12 @@ ninja_required_version = 1.7 builddir = build/linux bin = $builddir/bin obj = $builddir/obj @@ -16,7 +16,7 @@ description = Compile C $out deps = gcc depfile = $out.d -@@ -15,14 +15,14 @@ +@@ -15,14 +15,14 @@ build $obj/source_bee/lua-seri.obj: c_source_bee $ 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 $ @@ -33,7 +33,7 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -57,7 +57,7 @@ +@@ -58,7 +58,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_1 bee.lua/bee/version.cpp 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 $ @@ -42,30 +42,21 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -80,14 +80,14 @@ +@@ -88,7 +88,7 @@ build $obj/source_bee/luaref.obj: cxx_source_bee_2 bee.lua/binding/luaref.cpp 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 + -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -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,15 +95,15 @@ - rule cxx_source_bootstrap + build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c +@@ -97,14 +97,14 @@ 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 + -DNDEBUG -fPIC -o $out -c $in +- description = Compile C++ $out ++ description = Compile C++ $out CXXFLAGS deps = gcc depfile = $out.d build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $ @@ -76,5 +67,5 @@ + command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl $ + -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 $ + rule copy + command = cp -fv $in$input $out 1>/dev/null diff --git a/dev-util/lua-language-server/files/linux.ninja_v2.patch b/dev-util/lua-language-server/files/linux.ninja_v2.patch deleted file mode 100644 index b4eba4b75e19..000000000000 --- a/dev-util/lua-language-server/files/linux.ninja_v2.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- a/3rd/luamake/compile/ninja/linux.ninja -+++ b/3rd/luamake/compile/ninja/linux.ninja -@@ -2,12 +2,12 @@ ninja_required_version = 1.7 - 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 @@ build $obj/source_bee/lua-seri.obj: c_source_bee $ - 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 -@@ -58,7 +58,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_1 bee.lua/bee/version.cpp - 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 -@@ -88,7 +88,7 @@ build $obj/source_bee/luaref.obj: cxx_source_bee_2 bee.lua/binding/luaref.cpp - rule c_source_lua - command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $ - -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -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 bee.lua/3rd/lua/linit.c -@@ -97,14 +97,14 @@ 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 -- description = Compile C++ $out -+ description = Compile C++ $out CXXFLAGS - deps = gcc - depfile = $out.d - build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $ - 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 -+ command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl $ -+ -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS - description = Link Exe $out - rule copy - command = cp -fv $in$input $out 1>/dev/null |