diff mbox series

[1/2] package/clamav: select musl-fts if not glibc

Message ID 20191012170455.9816-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/2] package/clamav: select musl-fts if not glibc | expand

Commit Message

Fabrice Fontaine Oct. 12, 2019, 5:04 p.m. UTC 
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>
---
 package/clamav/Config.in |  1 +
 package/clamav/clamav.mk | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

Comments

Arnout Vandecappelle Oct. 13, 2019, 8:35 p.m. UTC | #1 
On 12/10/2019 19:04, Fabrice Fontaine wrote:
> 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>

 Applied to master, thanks.

 Regards,
 Arnout
diff mbox series

Patch

diff --git a/package/clamav/Config.in b/package/clamav/Config.in
index b3f09aebda..08f3e47461 100644
--- 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 6500826339..18aedd7591 100644
--- 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 \