package/clamav: add optional dependency to pcre2
authorBernd Kuhls <bernd.kuhls@t-online.de>
Sat, 26 Jan 2019 10:10:37 +0000 (11:10 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Sun, 27 Jan 2019 09:49:47 +0000 (10:49 +0100)
Upstream recommends pcre2 over pcre:
https://github.com/Cisco-Talos/clamav-devel/commit/1f71c2b21ccaef412280471444f4d01ec9b8099d

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/clamav/clamav.mk

index 7e1b162f79771186b473cfc685c73cd0e6c0df87..b5a184a67ce1a7e9dd4e92430280b9f939357a1b 100644 (file)
@@ -76,7 +76,10 @@ else
 CLAMAV_CONF_OPTS += --without-iconv
 endif
 
-ifeq ($(BR2_PACKAGE_PCRE),y)
+ifeq ($(BR2_PACKAGE_PCRE2),y)
+CLAMAV_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr
+CLAMAV_DEPENDENCIES += pcre2
+else ifeq ($(BR2_PACKAGE_PCRE),y)
 CLAMAV_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr
 CLAMAV_DEPENDENCIES += pcre
 else