From patchwork Wed Sep 23 17:54:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1370005 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BxQmp2Rsrz9sS8 for ; Thu, 24 Sep 2020 03:54:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 33665272BB; Wed, 23 Sep 2020 17:54:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4OrI74NuRQuO; Wed, 23 Sep 2020 17:54:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C3E6627233; Wed, 23 Sep 2020 17:54:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 915091BF385 for ; Wed, 23 Sep 2020 17:54:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8CDC3854B3 for ; Wed, 23 Sep 2020 17:54:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jLCuBbmt0JZt for ; Wed, 23 Sep 2020 17:54:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by whitealder.osuosl.org (Postfix) with ESMTPS id 017F585074 for ; Wed, 23 Sep 2020 17:54:39 +0000 (UTC) Received: from fwd01.aul.t-online.de (fwd01.aul.t-online.de [172.20.27.147]) by mailout04.t-online.de (Postfix) with SMTP id 5F73E41BF955 for ; Wed, 23 Sep 2020 19:54:37 +0200 (CEST) Received: from fli4l.lan.fli4l (Z6zz-ZZJQhZtcJyArb-oJonzKZ3wsDwv09OWrq4oefyJqCl0y+fNAuZD+o+ZU3IZ3t@[91.58.11.216]) by fwd01.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1kL8yS-1BGQts0; Wed, 23 Sep 2020 19:54:36 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:58880) by fli4l.lan.fli4l with esmtp (Exim 4.94) (envelope-from ) id 1kL8yS-0004eS-5h for buildroot@buildroot.org; Wed, 23 Sep 2020 19:54:36 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Wed, 23 Sep 2020 19:54:36 +0200 Message-Id: <20200923175436.71450-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-ID: Z6zz-ZZJQhZtcJyArb-oJonzKZ3wsDwv09OWrq4oefyJqCl0y+fNAuZD+o+ZU3IZ3t X-TOI-EXPURGATEID: 150726::1600883677-0000355B-B4898210/0/0 CLEAN NORMAL X-TOI-MSGID: 55c095cb-4a36-4994-9e1d-d585955fdeac Subject: [Buildroot] [PATCH 1/1] package/clamav: needs dynamic library X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Upstream commit https://github.com/Cisco-Talos/clamav-devel/commit/9e20cdf6eaf545a66f55ce5ba85ef9a98dad3648 added dlopen() to others.c https://github.com/Cisco-Talos/clamav-devel/blob/dev/0.104/libclamav/others.c#L199 "libclamav used to build in multiple stages where an earlier stage is a static library containing utils required by the "shared" code. Linking clamdscan and clamdtop with this libclamav utils static lib allowed these two apps to function without libclamav. While this is nice in theory, the practical gains are minimal and it complicates the build system. As such, the autotools and CMake tooling was simplified for improved maintainability and this feature was thrown out. clamdtop and clamdscan now require libclamav to function." Fixes: http://autobuild.buildroot.net/results/e27/e276894781e3e37fbc03a0745738c61541e0a211/ http://autobuild.buildroot.net/results/552/552ee8d9e44152c9d7e315a5491542771264d466/ http://autobuild.buildroot.net/results/fde/fde4af47542f0eb0bd57b172c99bd086eb566b76/ Signed-off-by: Bernd Kuhls --- package/clamav/Config.in | 6 +++--- package/clamav/clamav.mk | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) 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 \