Gentoo Archives: gentoo-commits

From: Mathis Winterer <mrmagic223325@××××××.email>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-util/lua-language-server/, dev-util/lua-language-server/files/
Date: Mon, 02 Jan 2023 17:23:38
Message-Id: 1672680079.23e8e520d9b8af85911db07a906da5f458bdc570.mrmagic223325@gentoo
1 commit: 23e8e520d9b8af85911db07a906da5f458bdc570
2 Author: Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
3 AuthorDate: Mon Jan 2 17:21:19 2023 +0000
4 Commit: Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
5 CommitDate: Mon Jan 2 17:21:19 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=23e8e520
7
8 dev-util/lua-language-server: Switch to patches
9
10 Signed-off-by: Mathis Winterer <mrmagic223325 <AT> fedora.email>
11
12 dev-util/lua-language-server/files/build.ninja.patch | 6 +++---
13 dev-util/lua-language-server/files/linux.ninja.patch | 4 ++--
14 dev-util/lua-language-server/lua-language-server-3.6.4.ebuild | 2 --
15 3 files changed, 5 insertions(+), 7 deletions(-)
16
17 diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
18 index 49111813b..d736f3619 100644
19 --- a/dev-util/lua-language-server/files/build.ninja.patch
20 +++ b/dev-util/lua-language-server/files/build.ninja.patch
21 @@ -1,5 +1,5 @@
22 ---- a/build/build.ninja 2023-01-01 23:53:30.813718024 +0100
23 -+++ b/build/build.ninja 2023-01-01 23:04:59.011627739 +0100
24 +--- a/build/build.ninja
25 ++++ b/build/build.ninja
26 @@ -2,7 +2,7 @@
27 builddir = build
28 bin = bin
29 @@ -109,7 +109,7 @@
30 + command = $cc -MMD -MT $out -MF $out.d -std=c++17 $
31 + -I3rd/EmmyLuaCodeStyle/include $
32 -I3rd/bee.lua/3rd/lua -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include $
33 -- -DNDEBUG -march=native -O2 -pipe -o $out -c $in
34 +- -DNDEBUG -Wall -Werror -o $out -c $in
35 + -DNDEBUG -o $out -c $in CXXFLAGS
36 description = Compile C++ $out
37 deps = gcc
38
39 diff --git a/dev-util/lua-language-server/files/linux.ninja.patch b/dev-util/lua-language-server/files/linux.ninja.patch
40 index a9a853ed7..b5dbb5348 100644
41 --- a/dev-util/lua-language-server/files/linux.ninja.patch
42 +++ b/dev-util/lua-language-server/files/linux.ninja.patch
43 @@ -1,5 +1,5 @@
44 ---- a/3rd/luamake/compile/ninja/linux.ninja 2022-11-29 13:53:05.000000000 +0100
45 -+++ b/3rd/luamake/compile/ninja/linux.ninja 2023-01-01 22:40:43.690777107 +0100
46 +--- a/3rd/luamake/compile/ninja/linux.ninja
47 ++++ b/3rd/luamake/compile/ninja/linux.ninja
48 @@ -2,20 +2,20 @@
49 builddir = build/linux
50 bin = $builddir/bin
51
52 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.4.ebuild
53 index f0cf3d9c3..1284b7e95 100644
54 --- a/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
55 +++ b/dev-util/lua-language-server/lua-language-server-3.6.4.ebuild
56 @@ -28,8 +28,6 @@ src_prepare() {
57 make.lua || die
58 sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
59 3rd/lpeglabel/makefile || die
60 - sed -i "s/flags = \"-Wall -Werror\"/flags =\"${CXXFLAGS}\"/" \
61 - make/code_format.lua || die
62 # Patch
63 default
64 # Shipped file doesn't respect CFLAGS/CXXFLAGS