From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Tue, 28 Apr 2020 12:57:47 +0000 (+0300)
Subject: populate_sdk_base: create_sdk_files: Use _nativesdk variants for libdir and base_libdir
X-Git-Tag: uninative-2.9~971
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a6077e87f4eeb89b0617883c9c01e08219ae44dc;p=openembedded-core.git

populate_sdk_base: create_sdk_files: Use _nativesdk variants for libdir and base_libdir

Use the _nativesdk variants for libdir and base_libdir to fix the resulting
ld.so.conf paths in the SDK for systems with libdir=/lib64.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 6a1ebc8c02..f85c3b9f62 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -187,8 +187,8 @@ fakeroot create_sdk_files() {
 	sed -i -e "s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:" ${SDK_OUTPUT}/${SDKPATH}/relocate_sdk.py
 
        mkdir -p ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/
-       echo '${SDKPATHNATIVE}${libdir}
-${SDKPATHNATIVE}${base_libdir}
+       echo '${SDKPATHNATIVE}${libdir_nativesdk}
+${SDKPATHNATIVE}${base_libdir_nativesdk}
 include /etc/ld.so.conf' > ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/ld.so.conf
 }