diff --git a/package/clamav/Config.in b/package/clamav/Config.in index 08f3e47461..990a818b5c 100644 --- a/package/clamav/Config.in +++ b/package/clamav/Config.in @@ -3,10 +3,10 @@ config BR2_PACKAGE_CLAMAV depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # dlopen depends on BR2_USE_WCHAR 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 @@ -16,7 +16,7 @@ config BR2_PACKAGE_CLAMAV http://www.clamav.net -comment "clamav needs a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP \ +comment "clamav needs a toolchain w/ C++, dynamic library, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR depends on BR2_USE_MMU diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index fc979a74aa..45d62943a0 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -14,7 +14,6 @@ CLAMAV_DEPENDENCIES = \ host-pkgconf \ libcurl \ libmspack \ - libtool \ openssl \ zlib \ $(TARGET_NLS_DEPENDENCIES) @@ -38,8 +37,6 @@ CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)" CLAMAV_CONF_OPTS = \ --with-dbdir=/var/lib/clamav \ - --with-ltdl-include=$(STAGING_DIR)/usr/include \ - --with-ltdl-lib=$(STAGING_DIR)/usr/lib \ --with-libcurl=$(STAGING_DIR)/usr \ --with-openssl=$(STAGING_DIR)/usr \ --with-system-libmspack=$(STAGING_DIR)/usr \