gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-10 12:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfdump: adjust patches

Browse Source 
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 <mike@flyn.org>
This commit is contained in:
W. Michael Petullo
2025-06-03 09:28:14 -05:00
committed by Josef Schlehofer
parent 7e7c8837a3
commit 104fa7a6ff
2 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/nfdump/patches/020-musl-fixes.patch → net/nfdump/patches/010-musl-fixes.patch
View File

@@ -7,8 +7,8 @@
-AX_CHECK_ZLIB([AM_CONDITIONAL(HAVEZLIB, true) readzpcap="yes"], [AM_CONDITIONAL(HAVEZLIB, false) readzpcap="no"]) -AX_CHECK_ZLIB([AM_CONDITIONAL(HAVEZLIB, true) readzpcap="yes"], [AM_CONDITIONAL(HAVEZLIB, false) readzpcap="no"])
- -
OVS_CHECK_ATOMIC_LIBS 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 --- a/src/nfpcapd/Makefile.am
+++ b/src/nfpcapd/Makefile.am +++ b/src/nfpcapd/Makefile.am
@@ -29,10 +29,4 @@ if HAVEPCAPAPPEND @@ -29,10 +29,4 @@ if HAVEPCAPAPPEND

20
net/nfdump/patches/010-musl-threads.patch
View File

@@ -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],