1 |
commit: 5711bbbf8ebb9de907828f168fac532db92527fa |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 30 12:52:48 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 30 12:55:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5711bbbf |
7 |
|
8 |
net-analyzer/mk-livestatus: Fix CFLAGS=-fno-common |
9 |
|
10 |
Also, drop python_foreach_impl since the ebuild uses python-single-r1. |
11 |
Also, fix src/Makefile.am to not delete a nonexistent file. |
12 |
|
13 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
14 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706990 |
15 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
16 |
|
17 |
.../files/mk-livestatus-1.2.8_p26-fno-common.patch | 29 ++++++++++++++++++++++ |
18 |
.../files/mk-livestatus-1.2.8_p26-rm.patch | 10 ++++++++ |
19 |
...26.ebuild => mk-livestatus-1.2.8_p26-r1.ebuild} | 6 +++-- |
20 |
3 files changed, 43 insertions(+), 2 deletions(-) |
21 |
|
22 |
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..e0dc8469c15 |
25 |
--- /dev/null |
26 |
+++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch |
27 |
@@ -0,0 +1,29 @@ |
28 |
+--- a/src/logger.h |
29 |
++++ b/src/logger.h |
30 |
+@@ -27,6 +27,7 @@ |
31 |
+ |
32 |
+ #include "config.h" // IWYU pragma: keep |
33 |
+ #include <syslog.h> |
34 |
++#include <pthread.h> |
35 |
+ |
36 |
+ #ifdef CMC |
37 |
+ #define LG_DEBUG LOG_INFO |
38 |
+@@ -49,6 +50,8 @@ |
39 |
+ extern "C" { |
40 |
+ #endif |
41 |
+ |
42 |
++extern pthread_t g_mainthread_id; |
43 |
++ |
44 |
+ void logger(int priority, const char *loginfo, ...) |
45 |
+ __attribute__((format(printf, 2, 3))); |
46 |
+ void open_logfile(); |
47 |
+--- a/src/module.c |
48 |
++++ b/src/module.c |
49 |
+@@ -95,7 +95,6 @@ |
50 |
+ char g_logfile_path[4096]; |
51 |
+ int g_debug_level = 0; |
52 |
+ int g_should_terminate = false; |
53 |
+-pthread_t g_mainthread_id; |
54 |
+ pthread_t *g_clientthread_id; |
55 |
+ unsigned long g_max_cached_messages = 500000; |
56 |
+ unsigned long g_max_lines_per_logfile = |
57 |
|
58 |
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch |
59 |
new file mode 100644 |
60 |
index 00000000000..abdb2e01691 |
61 |
--- /dev/null |
62 |
+++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch |
63 |
@@ -0,0 +1,10 @@ |
64 |
+--- a/src/Makefile.am |
65 |
++++ b/src/Makefile.am |
66 |
+@@ -62,7 +62,6 @@ |
67 |
+ install-data-local: |
68 |
+ $(mkinstalldirs) $(DESTDIR)$(pkglibdir) |
69 |
+ $(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir) |
70 |
+- rm -f $(DESTDIR)$(pkglibdir)/livestatus.so |
71 |
+ |
72 |
+ clean-local: |
73 |
+ rm -f *~ |
74 |
|
75 |
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild |
76 |
similarity index 95% |
77 |
rename from net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild |
78 |
rename to net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild |
79 |
index a1b4fa136b8..481cb302ca6 100644 |
80 |
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild |
81 |
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild |
82 |
@@ -1,4 +1,4 @@ |
83 |
-# Copyright 1999-2019 Gentoo Authors |
84 |
+# Copyright 1999-2020 Gentoo Authors |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
|
87 |
EAPI=6 |
88 |
@@ -58,6 +58,8 @@ S="${WORKDIR}/${MY_P}" |
89 |
PATCHES=( |
90 |
"${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch" |
91 |
"${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch" |
92 |
+ "${FILESDIR}"/${PN}-1.2.8_p26-fno-common.patch |
93 |
+ "${FILESDIR}"/${PN}-1.2.8_p26-rm.patch |
94 |
) |
95 |
|
96 |
src_prepare() { |
97 |
@@ -140,7 +142,7 @@ EOF |
98 |
fi |
99 |
|
100 |
if use python; then |
101 |
- python_foreach_impl python_domodule api/python/livestatus.py |
102 |
+ python_domodule api/python/livestatus.py |
103 |
|
104 |
if use examples; then |
105 |
docinto / |