From 6d3aa03272b9472bd8e48baf4f45b78c09715f38 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 30 Mar 2019 09:57:19 -0700 Subject: clamav: drop llvm version setting There is only one llvm and its in core so drop allowing it to be overwritten. We can hardcode it now. Signed-off-by: Armin Kuster --- recipes-security/clamav/clamav_0.99.4.bb | 10 +++------- 1 file 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" # Clamav has a built llvm version 2 but does not build with gcc 6.x, # disable the internal one. This is a known issue -# If you want LLVM support, use meta-oe llvm3.3 to build for GCC 6.X, -# as defined below +# If you want LLVM support, use the one in core -CLAMAV_LLVM ?= "oellvm" -CLAMAV_LLVM_RELEASE ?= "8.0" - -PACKAGECONFIG ?= "ncurses openssl bz2 zlib ${CLAMAV_LLVM}" +PACKAGECONFIG ?= "ncurses openssl bz2 zlib llvm" PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" -PACKAGECONFIG[oellvm] = "--with-system-llvm --with-llvm-linking=dynamic --disable-llvm, ,llvm${CLAMAV_LLVM_RELEASE}" +PACKAGECONFIG[llvm] = "--with-system-llvm --with-llvm-linking=dynamic --disable-llvm, ,llvm8.0" PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_LIBDIR}, --without-pcre, libpcre" PACKAGECONFIG[xml] = "--with-xml=${STAGING_LIBDIR}/.., --with-xml=no, libxml2," -- cgit v1.2.3-54-g00ecf