From 012e4c1d7f6b502bb7e829419be122af03a70f54 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 30 Apr 2019 19:37:52 -0700 Subject: [PATCH] clamav: Remove build hacks Simplified the Makefile and fixes compilation with uClibc-ng. Also added IPv6 support. Took the time to clean up the Makefile with other useful options. Signed-off-by: Rosen Penev --- net/clamav/Makefile | 67 +++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/net/clamav/Makefile b/net/clamav/Makefile index b8d0625a97..bc399827df 100644 --- a/net/clamav/Makefile +++ b/net/clamav/Makefile @@ -9,17 +9,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=clamav PKG_VERSION:=0.101.2 -PKG_RELEASE:=1 - -PKG_LICENSE:=GPL-2.0 -PKG_MAINTAINER:=Marko Ratkaj \ - Lucian Cristian -PKG_CPE_ID:=cpe:/a:clamav:clamav +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.clamav.net/downloads/production/ PKG_HASH:=0a12ebdf6ff7a74c0bde2bdc2b55cae33449e6dd953ec90824a9e01291277634 +PKG_MAINTAINER:=Marko Ratkaj \ + Lucian Cristian +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYING* +PKG_CPE_ID:=cpe:/a:clamav:clamav + PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 @@ -57,34 +58,36 @@ endef define Package/clamav/conffiles endef +CONFIGURE_ARGS += \ + --sysconfdir=/etc/clamav/ \ + --enable-milter \ + --disable-bzip2 \ + --disable-check \ + --disable-clamdtop \ + --disable-rpath \ + --disable-xml \ + --disable-zlib-vcheck \ + --with-user=nobody \ + --with-group=nogroup \ + --with-libcurl="$(STAGING_DIR)/usr/" \ + --with-libjson="$(STAGING_DIR)/usr/" \ + --with-openssl="$(STAGING_DIR)/usr/" \ + --with-pcre="$(STAGING_DIR)/usr/" \ + --with-zlib="$(STAGING_DIR)/usr/" \ + --without-xml \ + --without-iconv \ + --without-libncurses-prefix + CONFIGURE_VARS += \ - INCLUDES="" \ - CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \ - $(if $(CONFIG_USE_MUSL),LIBS="-lpthread -lfts",LIBS="-lpthread") \ - -define Build/Configure - $(call Build/Configure/Default, \ - --sysconfdir=/etc/clamav/ \ - --prefix=/usr/ \ - --exec-prefix=/usr/ \ - --enable-milter \ - --with-xml=no \ - --disable-bzip2 \ - --with-user nobody \ - --with-group nogroup \ - --with-pcre="$(STAGING_DIR)/usr/" \ - --with-openssl="$(STAGING_DIR)/usr/" \ - --with-zlib="$(STAGING_DIR)/usr/" \ - --disable-zlib-vcheck \ - --disable-clamdtop \ - ) -endef + ax_cv_uname_syscall=yes \ + ac_cv_c_mmap_private=yes \ + have_cv_gai=yes \ + ac_cv_sys_file_offset_bits=no -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef +CONFIGURE_VARS += $(if $(CONFIG_IPV6),have_cv_ipv6=yes) + +TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -fno-rtti -flto +TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed $(if $(CONFIG_USE_MUSL),-lfts) define Package/clamav/install $(INSTALL_DIR) $(1)/usr/sbin -- 2.30.2