diff mbox series

[meta-lts-mixins,scarthgap/rust,33/35] cargo_c.bbclass: pass --libdir to cargo cinstall

Message ID c0864a356599d1cfc58d2cbcba2e8e3d7c0e8439.1785496469.git.scott.murray@konsulko.com
State New
Headers show
Series Update to 1.96.1 | expand

Commit Message

Scott Murray July 31, 2026, 11:33 a.m. UTC 
From: Taruntej Kanakamalla <tarun@centricular.com>

cargo-cinstall defaults its libdir to <prefix>/lib since the class does
not pass --libdir. On configurations where ${libdir} is not
<prefix>/lib (e.g. multilib builds where baselib is lib64), the libraries
and pkg-config files get installed into <prefix>/lib, causing do_package
QA failures (installed-vs-shipped).

Pass --libdir ${libdir} explicitly so cargo-cinstall installs the files
into the correct directory.

Signed-off-by: Taruntej Kanakamalla <tarun@centricular.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(adapted from oe-core commit ce8b2340e4a3fd146bb632898e196438505650e9)
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 classes-recipe/cargo_c.bbclass | 1 +
 1 file changed, 1 insertion(+)
diff mbox series

Patch

diff --git a/classes-recipe/cargo_c.bbclass b/classes-recipe/cargo_c.bbclass
index ef43163..e91ee1d 100644
--- a/classes-recipe/cargo_c.bbclass
+++ b/classes-recipe/cargo_c.bbclass
@@ -35,6 +35,7 @@  cargo_c_do_install() {
     "${CARGO_C_INSTALL}" cinstall ${CARGO_BUILD_FLAGS} \
         --destdir ${D} \
         --prefix ${prefix} \
+        --libdir ${libdir} \
         --library-type cdylib
 }