package/clamav: select musl-fts if not glibc

By selecting musl-fts, a build failure on internal fts is avoided

Fixes:
 - http://autobuild.buildroot.org/results/8f0d45202c9a7dbb4d0c7431040384990f04008b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/clamav/Config.in b/package/clamav/Config.in
index b3f09aebdaec4a4a1770eceb9fe637c5b7902455..08f3e47461978b2d4a6650acf7028ff0339da7e3 100644 (file)
--- a/package/clamav/Config.in
+++ b/package/clamav/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_CLAMAV
        select BR2_PACKAGE_LIBCURL
        select BR2_PACKAGE_LIBMSPACK
        select BR2_PACKAGE_LIBTOOL
+       select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_ZLIB
        help

diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk
index 650082633947b9981bed2af28cef54dba5605f68..18aedd759182c738f6e9fd27436d0ba9c4cf8d17 100644 (file)
--- a/package/clamav/clamav.mk
+++ b/package/clamav/clamav.mk
@@ -25,10 +25,16 @@ CLAMAV_CONF_ENV = \
        have_cv_ipv6=yes
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-CLAMAV_CONF_ENV += LIBS=-latomic
+CLAMAV_LIBS += -latomic
 endif
 
-# UCLIBC_HAS_FTS is disabled, therefore disable fanotify (missing fts.h)
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
+CLAMAV_DEPENDENCIES += musl-fts
+CLAMAV_LIBS += -lfts
+endif
+
+CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)"
+
 CLAMAV_CONF_OPTS = \
        --with-dbdir=/var/lib/clamav \
        --with-ltdl-include=$(STAGING_DIR)/usr/include \
@@ -40,7 +46,6 @@ CLAMAV_CONF_OPTS = \
        --disable-zlib-vcheck \
        --disable-rpath \
        --disable-clamav \
-       --disable-fanotify \
        --disable-milter \
        --disable-llvm \
        --disable-clamdtop \