package/libnids: disable libnet only if not available
PATCH 1/1 package/libnids: disable libnet only if not available
libnids can be built against an existing libnet lib, take advantage of that.
Unfortunately, pkg-config is not available for libnet, so configure --with-libnet is our only option at the moment.
--with-libnet expects a build directory,
not an installation path like in our context. We use --with-libnet=yes to skip tests that would fail. In this situation, 'LIBNET' goes undefined, so we need to define it ourselves.
This works because we make sure -lnet is installed prior anything related to libnids.
--- package/libnids/libnids.mk | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
package/libnids/libnids.mk +15 -1
@@ -11,7 +11,21 @@ LIBNIDS_LICENSE_FILES = COPYING LIBNIDS_INSTALL_STAGING = YES LIBNIDS_DEPENDENCIES = host-pkgconf libpcap LIBNIDS_AUTORECONF = YES -LIBNIDS_CONF_OPTS = --disable-libnet + +# disable libnet if not available +# Tests in configure.in expect --with-libnet=$build_dir +# not an installation patch like in our context. +# We use with-libnet=yes to skip the unusual paths tests. +# But 'LNETLIB' gets left out, so we need to define it ourselves. +ifeq ($(BR2_PACKAGE_LIBNET),y) +LIBNIDS_DEPENDENCIES += libnet + +LIBNIDS_CONF_OPTS += --with-libnet=yes \ + LNETLIB=-lnet \ + --enable-libnet +else +LIBNIDS_CONF_OPTS += --disable-libnet +endif # disable libglib2 if not available # The test in configure.in is flawed: passing --enable-libglib would also
Signature · 1 line
2.20.1
PATCH 1/1 package/libnids: disable libnet only if not available
Guillaume, All,
On 2020-06-24 14:17 +0200, Guillaume W. Bres spake thusly:
Quoted 31 lines
libnids can be built against an existing libnet lib, take advantage of that.
Unfortunately, pkg-config is not available for libnet, so configure --with-libnet is our only option at the moment.
--with-libnet expects a build directory,
not an installation path like in our context. We use --with-libnet=yes to skip tests that would fail. In this situation, 'LIBNET' goes undefined, so we need to define it ourselves.
This works because we make sure -lnet is installed prior anything related to libnids.Signed-off-by Guillaume W. Bres <[email protected]>--- package/libnids/libnids.mk | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)package/libnids/libnids.mk +2
-1@@ -11,7 +11,21 @@ LIBNIDS_LICENSE_FILES = COPYING LIBNIDS_INSTALL_STAGING = YES LIBNIDS_DEPENDENCIES = host-pkgconf libpcap LIBNIDS_AUTORECONF = YES -LIBNIDS_CONF_OPTS = --disable-libnet + +# disable libnet if not available
package/libnids/libnids.mk LIBNIDS_LICENSE_FILES = COPYING · line 25
Quoted 10 lines
package/libnids/libnids.mk +10
-0+# Tests in configure.in expect --with-libnet=$build_dir +# not an installation patch like in our context. +# We use with-libnet=yes to skip the unusual paths tests. +# But 'LNETLIB' gets left out, so we need to define it ourselves. +ifeq ($(BR2_PACKAGE_LIBNET),y) +LIBNIDS_DEPENDENCIES += libnet + +LIBNIDS_CONF_OPTS += --with-libnet=yes \ + LNETLIB=-lnet \ + --enable-libnet
I've reordered the options in a more logical way. Additionally, when an assignment (or any other statement) fits on a 80-char line, we don't split it on multiple lines, so I;ve changed to:
LIBNIDS_CONF_OPTS += --enable-libnet --with-libnet=yes LNETLIB=-lnet
and applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 13 lines
package/libnids/libnids.mk +3
-0+else +LIBNIDS_CONF_OPTS += --disable-libnet +endif # disable libglib2 if not available # The test in configure.in is flawed: passing --enable-libglib would alsoSignature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'