From 104fa7a6ffe4b853129a49364593ff8290733172 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 3 Jun 2025 09:28:14 -0500 Subject: [PATCH] nfdump: adjust patches The second patch, which addresses a problem where the build would include -I/usr/include, made the first patch obsolete. The first patch had fixed the detection of pthreads, but this was a red herring caused by the circumstances surrounding the second. Signed-off-by: W. Michael Petullo --- ...-musl-fixes.patch => 010-musl-fixes.patch} | 4 ++-- net/nfdump/patches/010-musl-threads.patch | 20 ------------------- 2 files changed, 2 insertions(+), 22 deletions(-) rename net/nfdump/patches/{020-musl-fixes.patch => 010-musl-fixes.patch} (84%) delete mode 100644 net/nfdump/patches/010-musl-threads.patch diff --git a/net/nfdump/patches/020-musl-fixes.patch b/net/nfdump/patches/010-musl-fixes.patch similarity index 84% rename from net/nfdump/patches/020-musl-fixes.patch rename to net/nfdump/patches/010-musl-fixes.patch index 4d7c495f73..5894477898 100644 --- a/net/nfdump/patches/020-musl-fixes.patch +++ b/net/nfdump/patches/010-musl-fixes.patch @@ -7,8 +7,8 @@ -AX_CHECK_ZLIB([AM_CONDITIONAL(HAVEZLIB, true) readzpcap="yes"], [AM_CONDITIONAL(HAVEZLIB, false) readzpcap="no"]) - OVS_CHECK_ATOMIC_LIBS - # Musl includes pthread functions in libc. - # AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found)) + AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found)) + --- a/src/nfpcapd/Makefile.am +++ b/src/nfpcapd/Makefile.am @@ -29,10 +29,4 @@ if HAVEPCAPAPPEND diff --git a/net/nfdump/patches/010-musl-threads.patch b/net/nfdump/patches/010-musl-threads.patch deleted file mode 100644 index 7deca0973d..0000000000 --- a/net/nfdump/patches/010-musl-threads.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -367,11 +367,12 @@ AM_COND_IF([BUILDNFPCAPD], - AX_CHECK_ZLIB([AM_CONDITIONAL(HAVEZLIB, true) readzpcap="yes"], [AM_CONDITIONAL(HAVEZLIB, false) readzpcap="no"]) - - OVS_CHECK_ATOMIC_LIBS --AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found)) -- --LIBS="$PTHREAD_LIBS $LIBS" --CFLAGS="$CFLAGS $PTHREAD_CFLAGS" --CC="$PTHREAD_CC" -+# Musl includes pthread functions in libc. -+# AX_PTHREAD([],AC_MSG_ERROR(No valid pthread configuration found)) -+# -+# LIBS="$PTHREAD_LIBS $LIBS" -+# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+# CC="$PTHREAD_CC" - - # Check for structures - AC_CHECK_MEMBER([struct sockaddr.sa_len],