deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/clamav: select musl-fts if not glibc

Browse source 
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>
This commit is contained in:
Fabrice Fontaine 2019-10-12 19:04:54 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent aa36ff8f1a
commit be09d22f50
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package/clamav/Config.in
View file

@ -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

11
package/clamav/clamav.mk
View file

@ -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 \