| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 1 | From a913b85f720f41bf7e5819c0dc4acc252467a8a4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 15 Feb 2022 14:25:07 -0800 |
| 4 | Subject: [PATCH] configure.ac.in: Allow dynamic linking against ndpi 3.0 |
| 5 | |
| 6 | Linking statically is problematic since NDPI_LIBS is '-lndpi -lm' |
| 7 | and when we use -Bstatic it also brings in -lm to use libm.a and on some |
| 8 | architectures ( x86 ) which this does not work and results in missing symbols |
| 9 | |
| 10 | Fixes |
| 11 | ipe-sysroot/usr/lib/libm.a(e_logf.o): in function `logf_ifunc_selector': |
| 12 | /usr/src/debug/glibc/2.35-r0/git/math/../sysdeps/i386/i686/multiarch/ifunc-sse2.h:30: undefined reference to `_dl_x86_cpu_features' |
| 13 | |
| 14 | Upstream-Status: Submitted [https://github.com/ntop/ntopng/pull/6318] |
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 16 | --- |
| 17 | configure.ac.in | 6 ++---- |
| 18 | 1 file changed, 2 insertions(+), 4 deletions(-) |
| 19 | |
| 20 | diff --git a/configure.ac.in b/configure.ac.in |
| 21 | index 7f4c0f893..c3299fda2 100644 |
| 22 | --- a/configure.ac.in |
| 23 | +++ b/configure.ac.in |
| 24 | @@ -193,10 +193,8 @@ if test -d /usr/local/include/ndpi ; then : |
| 25 | fi |
| 26 | |
| 27 | PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ |
| 28 | - NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` |
| 29 | - # Use static libndpi library as building against the dynamic library fails |
| 30 | - NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" |
| 31 | - #NDPI_LIB="$NDPI_LIBS" |
| 32 | + NDPI_INC="$NDPI_CFLAGS" |
| 33 | + NDPI_LIB="$NDPI_LIBS" |
| 34 | NDPI_LIB_DEP= |
| 35 | ], [ |
| 36 | AC_MSG_CHECKING(for nDPI source) |
| 37 | -- |
| 38 | 2.35.1 |
| 39 | |