diff options
| author |   Sam James <sam@gentoo.org> | 2023-02-03 16:49:23 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-02-03 16:51:39 +0000 |
| commit | 25646dfc75b15c2bcc9c80ab3aba7a6bab5eec68 (patch) | |
| tree | 9f024aaafb4f426f3ece3112353506f09ff00e68 /net-analyzer/ntopng/files | |
| parent | net-libs/nDPI: add 4.6 (diff) | |
| download | gentoo-25646dfc75b15c2bcc9c80ab3aba7a6bab5eec68.tar.gz gentoo-25646dfc75b15c2bcc9c80ab3aba7a6bab5eec68.tar.bz2 gentoo-25646dfc75b15c2bcc9c80ab3aba7a6bab5eec68.zip | |
net-analyzer/ntopng: add 5.4
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-analyzer/ntopng/files')
| -rw-r--r-- | net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch b/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch new file mode 100644 index 000000000000..8a50b7cb1a10 --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch @@ -0,0 +1,49 @@ +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -231,31 +231,8 @@ NDPI_LIB= + NDPI_LIB_DEP= + + AC_MSG_CHECKING(for nDPI source) +- if test -d "./nDPI" ; then : +- NDPI_HOME=./nDPI +- elif test -d "../nDPI" ; then : +- NDPI_HOME=../nDPI +- elif test -d "$HOME/nDPI" ; then : +- NDPI_HOME=$HOME/nDPI +- fi +- +- if test ! -z "$NDPI_HOME" ; then : +- AC_MSG_RESULT(found in $NDPI_HOME) +- NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a +- AC_MSG_CHECKING(for $NDPI_LIB) +- if test -r $NDPI_LIB ; then : +- AC_MSG_RESULT(found $NDPI_LIB) +- else +- AC_MSG_RESULT(not found $NDPI_LIB: compiling) +- cd $NDPI_HOME; ./autogen.sh; ${MAKE}; cd - +- fi +- NDPI_INC="-I$NDPI_HOME/src/include -I$NDPI_HOME/src/lib/third_party/include" +- NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a +- NDPI_LIB_DEP=$NDPI_LIB +- else +- AC_MSG_RESULT(not found) +- fi +- ++ NDPI_LIB="-lndpi" ++ NDPI_LIB_DEP=$NDPI_LIB + + if test ! -z "$NDPI_CUST_INC" ; then : + NDPI_INC=$NDPI_CUST_INC +diff --git a/configure.ac.in b/configure.ac.in +index ed906b1..3e70bec 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -242,7 +242,7 @@ if test ! -z "$NDPI_CUST_LIB" ; then : + NDPI_LIB=$NDPI_CUST_LIB + fi + +-if test -z "$NDPI_INC" || test -z "$NDPI_LIB" ; then : ++if test -z "$NDPI_LIB" ; then : + echo "Could not find nDPI" + echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; ${MAKE}; cd ../ntopng" + echo "and try again" |