[v4,1/9] llvm: move libLLVM.so.N.M to llvm-libllvm package

Message ID	20250331-mesa-25-v4-1-e62fc54a6efc@oss.qualcomm.com
State	Accepted, archived
Commit	1f729a019c6e5ea35d9a5196b68d81f31a8a1594
Headers	show Return-Path: <dmitry.baryshkov@oss.qualcomm.com> ip: 205.220.168.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Date: Mon, 31 Mar 2025 15:21:34 +0300 Subject: [PATCH v4 1/9] llvm: move libLLVM.so.N.M to llvm-libllvm package MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250331-mesa-25-v4-1-e62fc54a6efc@oss.qualcomm.com> References: <20250331-mesa-25-v4-0-e62fc54a6efc@oss.qualcomm.com> In-Reply-To: <20250331-mesa-25-v4-0-e62fc54a6efc@oss.qualcomm.com> To: openembedded-core@lists.openembedded.org Cc: Khem Raj <raj.khem@gmail.com>
Series	mesa: upgrade to 25.0.2 \| expand [v4,0/9] mesa: upgrade to 25.0.2 [v4,1/9] llvm: move libLLVM.so.N.M to llvm-libllvm package [v4,2/9] llvm: use OECMAKE_SOURCEPATH to specify cmake dir [v4,3/9] llvm: handle libdir in llvm-config [v4,4/9] llvm: also use llvm-config wrapper for nativesdk recipes [v4,5/9] llvm: support building libclc [v4,6/9] llvm: add SPIRV-LLVM-Translator support [v4,7/9] mesa: upgrade 24.0.7 -> 25.0.2 [v4,8/9] bindgen-cli: a tool to generate Rust bindings [v4,9/9] mesa: add support for RustiCL under PACKAGECONFIG "opencl"

Message ID

20250331-mesa-25-v4-1-e62fc54a6efc@oss.qualcomm.com

State

Accepted, archived

Commit

1f729a019c6e5ea35d9a5196b68d81f31a8a1594

Headers

From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Date: Mon, 31 Mar 2025 15:21:34 +0300
Subject: [PATCH v4 1/9] llvm: move libLLVM.so.N.M to llvm-libllvm package
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20250331-mesa-25-v4-1-e62fc54a6efc@oss.qualcomm.com>
References: <20250331-mesa-25-v4-0-e62fc54a6efc@oss.qualcomm.com>
In-Reply-To: <20250331-mesa-25-v4-0-e62fc54a6efc@oss.qualcomm.com>
To: openembedded-core@lists.openembedded.org
Cc: Khem Raj <raj.khem@gmail.com>

Series

mesa: upgrade to 25.0.2 | expand

Commit Message

Dmitry Baryshkov March 31, 2025, 12:21 p.m. UTC

Neither MAJOR_VER nor MINOR_VER are defined, so libLLVM.so.N.M ends up
in the main libllvm package rather than the llvm-libllvm package, as
expected. Fix this by properly using two-component version.

Fixes: db3bf550a372 ("llvm: Update to 18.1.0 RC4")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 meta/recipes-devtools/llvm/llvm_20.1.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/llvm/llvm_20.1.0.bb b/meta/recipes-devtools/llvm/llvm_20.1.0.bb
index 7ffc6ec1cb8a041f3ce1c3ac75fad30f1d793916..296a164cdd7ffb45f056c879cc5fc4fbc459caba 100644
--- a/meta/recipes-devtools/llvm/llvm_20.1.0.bb
+++ b/meta/recipes-devtools/llvm/llvm_20.1.0.bb
@@ -19,6 +19,7 @@  VER_SUFFIX = ""
 PV .= "${VER_SUFFIX}"
 
 MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}"
+MAJ_MIN_VERSION = "${@oe.utils.trim_version("${PV}", 2)}"
 
 LLVM_RELEASE = "${PV}"
 
@@ -152,7 +153,7 @@  FILES:${PN}-bugpointpasses = "\
 
 FILES:${PN}-libllvm = "\
     ${libdir}/libLLVM-${MAJOR_VERSION}.so \
-    ${libdir}/libLLVM.so.${MAJOR_VER}.${MINOR_VER} \
+    ${libdir}/libLLVM.so.${MAJ_MIN_VERSION} \
 "
 
 FILES:${PN}-liblto += "\

[v4,1/9] llvm: move libLLVM.so.N.M to llvm-libllvm package

Commit Message

Patch