mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-06-05 02:20:50 +00:00
Code Issues Projects Releases Wiki Activity

clamav: drop llvm version setting

Browse Source 
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 <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2019-03-30 09:57:19 -07:00
parent f1f54b94ad
commit 6d3aa03272
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-security/clamav/clamav_0.99.4.bb
+3 -7
View File
@@ -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,"