diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2020-01-30 13:52:48 +0100 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2020-01-30 13:55:23 +0100 |
| commit | 5711bbbf8ebb9de907828f168fac532db92527fa (patch) | |
| tree | 95cd8ec584073743c1d55e4eda7e5eeb4f164d94 | |
| parent | dev-python/importlib_metadata: x86 stable wrt bug #707062 (diff) | |
| download | gentoo-5711bbbf.tar.gz gentoo-5711bbbf.tar.bz2 gentoo-5711bbbf.zip | |
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>
| -rw-r--r-- | net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch | 29 | ||||
| -rw-r--r-- | net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch | 10 | ||||
| -rw-r--r-- | net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild (renamed from net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild) | 6 |
3 files changed, 43 insertions, 2 deletions
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 new file mode 100644 index 000000000000..e0dc8469c15a --- /dev/null +++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch @@ -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 = 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 new file mode 100644 index 000000000000..abdb2e01691b --- /dev/null +++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch @@ -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 *~ 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 index a1b4fa136b85..481cb302ca67 100644 --- 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 @@ -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 / |