net-analyzer/mk-livestatus: Fix CFLAGS=-fno-common

Also, drop python_foreach_impl since the ebuild uses python-single-r1.
Also, fix src/Makefile.am to not delete a nonexistent file.

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706990
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
This commit is contained in:
Jeroen Roovers
2020-01-30 13:52:48 +01:00
parent 8562fe56ef
commit 5711bbbf8e
3 changed files with 43 additions and 2 deletions

View File

@@ -0,0 +1,29 @@
--- a/src/logger.h
+++ b/src/logger.h
@@ -27,6 +27,7 @@
#include "config.h" // IWYU pragma: keep
#include <syslog.h>
+#include <pthread.h>
#ifdef CMC
#define LG_DEBUG LOG_INFO
@@ -49,6 +50,8 @@
extern "C" {
#endif
+extern pthread_t g_mainthread_id;
+
void logger(int priority, const char *loginfo, ...)
__attribute__((format(printf, 2, 3)));
void open_logfile();
--- a/src/module.c
+++ b/src/module.c
@@ -95,7 +95,6 @@
char g_logfile_path[4096];
int g_debug_level = 0;
int g_should_terminate = false;
-pthread_t g_mainthread_id;
pthread_t *g_clientthread_id;
unsigned long g_max_cached_messages = 500000;
unsigned long g_max_lines_per_logfile =

View File

@@ -0,0 +1,10 @@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,7 +62,6 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
$(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir)
- rm -f $(DESTDIR)$(pkglibdir)/livestatus.so
clean-local:
rm -f *~

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -58,6 +58,8 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch"
"${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
"${FILESDIR}"/${PN}-1.2.8_p26-fno-common.patch
"${FILESDIR}"/${PN}-1.2.8_p26-rm.patch
)
src_prepare() {
@@ -140,7 +142,7 @@ EOF
fi
if use python; then
python_foreach_impl python_domodule api/python/livestatus.py
python_domodule api/python/livestatus.py
if use examples; then
docinto /