From c0d9ba562c5522096d4ed70827c599c9a0e9aa7c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 9 Oct 2018 19:22:17 +0200 Subject: [PATCH] nmap: use system liblinear Use system liblinear instead of using included liblinear. liblinear in buildroot is at version 2.20 released on December 2017 whereas liblinear in nmap has not been updated since 7 years (except for liblinear.vcxproj which has been updated 2 years ago) Do not use --with-liblinear option as otherwise nmap will forget to add -llinear to LIBS due to the following line in configure.ac: if test $have_liblinear != yes; then AC_CHECK_HEADERS([linear.h], AC_CHECK_LIB(linear, predict, [have_liblinear=yes; LIBLINEAR_LIBS="-llinear"; break],, [-lm]) ) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/nmap/Config.in | 1 + package/nmap/nmap.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/nmap/Config.in b/package/nmap/Config.in index c1aafeceb9..51dd3423ea 100644 --- a/package/nmap/Config.in +++ b/package/nmap/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_NMAP depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBLINEAR select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_NMAP_NMAP \ if !BR2_PACKAGE_NMAP_NCAT && !BR2_PACKAGE_NMAP_NPING && !BR2_PACKAGE_NMAP_NDIFF diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 8809d4c037..761df3ffa8 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -7,9 +7,9 @@ NMAP_VERSION = 7.70 NMAP_SITE = https://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 -NMAP_DEPENDENCIES = libpcap +NMAP_DEPENDENCIES = liblinear libpcap NMAP_CONF_OPTS = --without-liblua --without-zenmap \ - --with-libdnet=included --with-liblinear=included + --with-libdnet=included NMAP_LICENSE = nmap license NMAP_LICENSE_FILES = COPYING -- 2.30.2