commit: 0e0b1799883476036bbf43d107f90a6778ada810 Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx> AuthorDate: Fri Jan 10 21:09:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 8 01:36:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0b1799
net-analyzer/nfdump: fix musl compilation for version 1.7.4 Closes: https://bugs.gentoo.org/934056 Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx> Closes: https://github.com/gentoo/gentoo/pull/40091 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/nfdump/files/nfdump-1.7.2-musl.patch | 14 ++++++++++++++ .../nfdump/files/nfdump-1.7.2-nfreplay-gcc14.patch | 21 +++++++++++++++++++++ net-analyzer/nfdump/nfdump-1.7.4.ebuild | 4 +++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/net-analyzer/nfdump/files/nfdump-1.7.2-musl.patch b/net-analyzer/nfdump/files/nfdump-1.7.2-musl.patch new file mode 100644 index 000000000000..7e1d4ae12d3a --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.7.2-musl.patch @@ -0,0 +1,14 @@ +Backport patch from 1.7.5. + +https://github.com/phaag/nfdump/commit/925dd28f7e08e00479a2906d0343e6fa75a6a783 + +--- a/src/lib/daemon.c ++++ b/src/lib/daemon.c +@@ -41,6 +41,7 @@ + #include <sys/types.h> + // some linux are picky + #define __USE_GNU ++#define _GNU_SOURCE + #include <unistd.h> + + #include "util.h" diff --git a/net-analyzer/nfdump/files/nfdump-1.7.2-nfreplay-gcc14.patch b/net-analyzer/nfdump/files/nfdump-1.7.2-nfreplay-gcc14.patch new file mode 100644 index 000000000000..76fba5e0c2fe --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.7.2-nfreplay-gcc14.patch @@ -0,0 +1,21 @@ + +https://github.com/phaag/nfdump/commit/0b2796b52e1793b6e2eba29baf7f456217372965 + +From: Peter Haag <[email protected]> +Date: Tue, 20 Aug 2024 21:00:18 +0200 +Subject: [PATCH] Make gcc-14 happy + +--- a/src/nfreplay/nfreplay.c ++++ b/src/nfreplay/nfreplay.c +@@ -74,9 +74,11 @@ + #ifdef HAVE___FPURGE + #define FPURGE __fpurge + #endif ++#ifndef FPURGE + #ifdef HAVE_FPURGE + #define FPURGE fpurge + #endif ++#endif + + /* Local Variables */ + static int verbose = 0; diff --git a/net-analyzer/nfdump/nfdump-1.7.4.ebuild b/net-analyzer/nfdump/nfdump-1.7.4.ebuild index 25ed77c194fe..1bad6fd5a1f5 100644 --- a/net-analyzer/nfdump/nfdump-1.7.4.ebuild +++ b/net-analyzer/nfdump/nfdump-1.7.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -45,6 +45,8 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-1.6.19-libft.patch + "${FILESDIR}"/${PN}-1.7.2-musl.patch + "${FILESDIR}"/${PN}-1.7.2-nfreplay-gcc14.patch "${FILESDIR}"/${PN}-1.7.4-rrdtool-gcc14.patch )
