diff options
-rw-r--r-- | recipes-security/clamav/clamav_0.99.4.bb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/recipes-security/clamav/clamav_0.99.4.bb b/recipes-security/clamav/clamav_0.99.4.bb index 1d09ba6..6219d9e 100644 --- a/recipes-security/clamav/clamav_0.99.4.bb +++ b/recipes-security/clamav/clamav_0.99.4.bb | |||
@@ -31,17 +31,13 @@ GID = "clamav" | |||
31 | 31 | ||
32 | # Clamav has a built llvm version 2 but does not build with gcc 6.x, | 32 | # Clamav has a built llvm version 2 but does not build with gcc 6.x, |
33 | # disable the internal one. This is a known issue | 33 | # disable the internal one. This is a known issue |
34 | # If you want LLVM support, use meta-oe llvm3.3 to build for GCC 6.X, | 34 | # If you want LLVM support, use the one in core |
35 | # as defined below | ||
36 | 35 | ||
37 | CLAMAV_LLVM ?= "oellvm" | 36 | PACKAGECONFIG ?= "ncurses openssl bz2 zlib llvm" |
38 | CLAMAV_LLVM_RELEASE ?= "8.0" | ||
39 | |||
40 | PACKAGECONFIG ?= "ncurses openssl bz2 zlib ${CLAMAV_LLVM}" | ||
41 | PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" | 37 | PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" |
42 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 38 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" |
43 | 39 | ||
44 | PACKAGECONFIG[oellvm] = "--with-system-llvm --with-llvm-linking=dynamic --disable-llvm, ,llvm${CLAMAV_LLVM_RELEASE}" | 40 | PACKAGECONFIG[llvm] = "--with-system-llvm --with-llvm-linking=dynamic --disable-llvm, ,llvm8.0" |
45 | 41 | ||
46 | PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_LIBDIR}, --without-pcre, libpcre" | 42 | PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_LIBDIR}, --without-pcre, libpcre" |
47 | PACKAGECONFIG[xml] = "--with-xml=${STAGING_LIBDIR}/.., --with-xml=no, libxml2," | 43 | PACKAGECONFIG[xml] = "--with-xml=${STAGING_LIBDIR}/.., --with-xml=no, libxml2," |