aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2019-04-05 18:19:22 +0500
committerGitHub <noreply@github.com>2019-04-05 18:19:22 +0500
commit3558e402afe515148774c55602597d2b4975e9df (patch)
tree25cff5072526c3d51cc20c62fa584a1d4ecb7ca7
parent5867e3251497f1b07196688241aa6a443c8de292 (diff)
parent139bb0bc76e5511c92a7c58ebe6507c8c5b41f3e (diff)
downloadmeta-amd-3558e402afe515148774c55602597d2b4975e9df.tar.gz
meta-amd-3558e402afe515148774c55602597d2b4975e9df.tar.bz2
meta-amd-3558e402afe515148774c55602597d2b4975e9df.zip
Merge pull request #627 from abelal/clamav
LLVM version setting for components
-rw-r--r--common/conf/machine/include/amd-common-configurations.inc5
-rw-r--r--common/recipes-graphics/mesa/mesa_git.bb2
2 files changed, 5 insertions, 2 deletions
diff --git a/common/conf/machine/include/amd-common-configurations.inc b/common/conf/machine/include/amd-common-configurations.inc
index bbe63bc3..526fbd41 100644
--- a/common/conf/machine/include/amd-common-configurations.inc
+++ b/common/conf/machine/include/amd-common-configurations.inc
@@ -8,6 +8,11 @@ PREFERRED_VERSION_linux-yocto ?= "4.4%"
PREFERRED_VERSION_libav ?= "9.18"
PREFERRED_PROVIDER_llvm ?= "llvm7"
+# Components that depend on LLVM should set versions here
+# so we know what needs to be changed/validated as LLVM moves
+MESA_LLVM_RELEASE_amd = "7"
+CLAMAV_LLVM_RELEASE_amd = "7"
+
MULTILIBS ?= ""
require conf/multilib.conf
diff --git a/common/recipes-graphics/mesa/mesa_git.bb b/common/recipes-graphics/mesa/mesa_git.bb
index 596b8105..048ce06d 100644
--- a/common/recipes-graphics/mesa/mesa_git.bb
+++ b/common/recipes-graphics/mesa/mesa_git.bb
@@ -24,8 +24,6 @@ LIBVA_PLATFORMS .= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' libva-x11',
LIBVA_PLATFORMS .= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libva-wayland', '', d)}"
RDEPENDS_mesa-megadriver += "${@bb.utils.contains('PACKAGECONFIG', 'va', '${LIBVA_PLATFORMS}', '', d)}"
-MESA_LLVM_RELEASE_amd = "7"
-
SRC_URI_amd = "git://anongit.freedesktop.org/mesa/mesa;branch=master \
file://0001-configure.ac-obey-llvm_prefix-if-available.patch \
file://0001-configure.ac-adjust-usage-of-LLVM-flags.patch \