Date: Thu, 24 Mar 2022 23:48:56 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 66e6345cf99e - main - net/ntopng,net/ndpi: Fix build due to missing symbols in certain circumstances Message-ID: <202203242348.22ONmuOv085452@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=66e6345cf99ecb76939beba0b008e704fc7dcf5f commit 66e6345cf99ecb76939beba0b008e704fc7dcf5f Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2022-03-24 23:46:14 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2022-03-24 23:48:47 +0000 net/ntopng,net/ndpi: Fix build due to missing symbols in certain circumstances When building on live machines when rrdtool happens to be already present, which often happens automatically due to the order in which the ports system builds things locally, the ntopng port could fail due to unreferenced symbols from glib. This was caused by ntopng trying to unconditionally link statically to ndpi but not providing all required static libraries references to the command line. - Add databases/rrdtool dependency in ndpi to ensure the same libraries are used in both ports - Make ntopng unconditionally use dynamic linking for ndpi too, avoiding the issue described above. PR: 262756 --- net/ndpi/Makefile | 4 +++- net/ntopng/Makefile | 1 + net/ntopng/files/patch-configure.ac.in | 13 ++++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/net/ndpi/Makefile b/net/ndpi/Makefile index be5586355e87..bf446f5a7baa 100644 --- a/net/ndpi/Makefile +++ b/net/ndpi/Makefile @@ -2,6 +2,7 @@ PORTNAME= ndpi PORTVERSION= 4.2.d20220210 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net @@ -11,7 +12,8 @@ COMMENT= NTOP-maintained superset of the popular OpenDPI library LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libjson-c.so:devel/json-c \ +LIB_DEPENDS= librrd.so:databases/rrdtool \ + libjson-c.so:devel/json-c \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 0152a1c83dab..3c147efe9b1b 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -2,6 +2,7 @@ PORTNAME= ntopng PORTVERSION= 5.2.d20220314 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net diff --git a/net/ntopng/files/patch-configure.ac.in b/net/ntopng/files/patch-configure.ac.in index 6beddc465a27..e004ff597172 100644 --- a/net/ntopng/files/patch-configure.ac.in +++ b/net/ntopng/files/patch-configure.ac.in @@ -1,5 +1,16 @@ ---- configure.ac.in.orig 2022-02-08 09:52:25 UTC +--- configure.ac.in.orig 2022-03-14 16:15:57 UTC +++ configure.ac.in +@@ -236,8 +236,8 @@ PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ + PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ + NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` + # Use static libndpi library as building against the dynamic library fails +- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" +- #NDPI_LIB="$NDPI_LIBS" ++ #NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" ++ NDPI_LIB="$NDPI_LIBS" + NDPI_LIB_DEP= + ], [ + AC_MSG_CHECKING(for nDPI source) @@ -444,7 +444,7 @@ if test "${with_nedge+set}" != set; then PF_RING_HOME=${HOME}/PF_RING
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203242348.22ONmuOv085452>