From f1c6881ee1799426d85e6bd23347a875767c4994 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 14 Jul 2021 14:25:48 +0200 Subject: llvm: make upgradable via devtool Assembling PV from bits is too clever for devtool; but it can be done in the opposite direction. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-devtools/llvm/llvm_git.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'meta') diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 8a5d3dc9bf..de79adc410 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -19,11 +19,9 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -MAJOR_VERSION = "12" -MINOR_VERSION = "0" -PATCH_VERSION = "0" +PV = "12.0.0" -PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" +MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" @@ -178,7 +176,7 @@ FILES_${PN}-llvmhello = "\ FILES_${PN}-dev += " \ ${libdir}/${LLVM_DIR}/llvm-config \ ${libdir}/${LLVM_DIR}/libRemarks.so \ - ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.so \ + ${libdir}/${LLVM_DIR}/libLLVM-${PV}.so \ " FILES_${PN}-staticdev += "\ -- cgit 1.2.3-korg