diff options
author | Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> | 2025-04-10 05:54:41 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-04-11 11:44:22 +0100 |
commit | 8b7e9ea7893a2d746cb695dc4c29a7c5a9e39d4c (patch) | |
tree | 9c11ebc8b6bfe317ba029e171881808872fe4877 | |
parent | 3434e65b4e64f6e577533e661edfac9ba96a2e0b (diff) | |
download | poky-8b7e9ea7893a2d746cb695dc4c29a7c5a9e39d4c.tar.gz |
llvm: move libLLVM.so.N.M to llvm-libllvm package
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")
(From OE-Core rev: 1f729a019c6e5ea35d9a5196b68d81f31a8a1594)
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/llvm/llvm_20.1.2.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/llvm/llvm_20.1.2.bb b/meta/recipes-devtools/llvm/llvm_20.1.2.bb index d0549371ab..4c93c1bfec 100644 --- a/meta/recipes-devtools/llvm/llvm_20.1.2.bb +++ b/meta/recipes-devtools/llvm/llvm_20.1.2.bb | |||
@@ -19,6 +19,7 @@ VER_SUFFIX = "" | |||
19 | PV .= "${VER_SUFFIX}" | 19 | PV .= "${VER_SUFFIX}" |
20 | 20 | ||
21 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" | 21 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" |
22 | MAJ_MIN_VERSION = "${@oe.utils.trim_version("${PV}", 2)}" | ||
22 | 23 | ||
23 | LLVM_RELEASE = "${PV}" | 24 | LLVM_RELEASE = "${PV}" |
24 | 25 | ||
@@ -152,7 +153,7 @@ FILES:${PN}-bugpointpasses = "\ | |||
152 | 153 | ||
153 | FILES:${PN}-libllvm = "\ | 154 | FILES:${PN}-libllvm = "\ |
154 | ${libdir}/libLLVM-${MAJOR_VERSION}.so \ | 155 | ${libdir}/libLLVM-${MAJOR_VERSION}.so \ |
155 | ${libdir}/libLLVM.so.${MAJOR_VER}.${MINOR_VER} \ | 156 | ${libdir}/libLLVM.so.${MAJ_MIN_VERSION} \ |
156 | " | 157 | " |
157 | 158 | ||
158 | FILES:${PN}-liblto += "\ | 159 | FILES:${PN}-liblto += "\ |