meta-environment: Set libdir correctly to fix PKGCONFIG entries

Currently libdir is coming from cross-canadian which is incorrect. We
need to reset this to target_libdir so that the toolchains contain the
correct value.

(From OE-Core rev: 41f8f32c8da705ead464ee69bc5a1e120b137693)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index bd90f9f..cf1a83f 100644 (file)
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -29,6 +29,7 @@ python do_generate_content() {
 
     # make sure we only use the SDKTARGETSYSROOT value from 'd'
     localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True))
+    localdata.setVar('libdir', d.getVar('target_libdir', False))
 
     # Process DEFAULTTUNE
     bb.build.exec_func("create_sdk_files", localdata)