From ab8b5cbfd6bcfd77322623683fe4f3a925445913 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 16 Apr 2018 15:00:18 +0200 Subject: native bbclass: handle base_libdir as well Native.bbclass needs to fixup both base_libdir and libdir to handle things like multiarch. This fixes wic and ext4.* image failures during do_rootfs where mkfs.ext4 can't find its libraries. (From OE-Core rev: 464dad0dc93aeeedd34d90c2f06596060ec135fd) Signed-off-by: Koen Kooi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/native.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/classes/native.bbclass') diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index a911f2aebd..7f2df17f23 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -78,6 +78,7 @@ exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" sbindir = "${STAGING_SBINDIR_NATIVE}" +base_libdir = "${STAGING_LIBDIR_NATIVE}" libdir = "${STAGING_LIBDIR_NATIVE}" includedir = "${STAGING_INCDIR_NATIVE}" sysconfdir = "${STAGING_ETCDIR_NATIVE}" @@ -89,6 +90,7 @@ export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir} /lib /lib64 NATIVE_PACKAGE_PATH_SUFFIX ?= "" bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" +base_libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" -- cgit v1.2.3-54-g00ecf