]> code.ossystems Code Review - openembedded-core.git/commitdiff
populate_sdk_base: create_sdk_files: Use _nativesdk variants for libdir and base_libdir
authorOvidiu Panait <ovidiu.panait@windriver.com>
Tue, 28 Apr 2020 12:57:47 +0000 (15:57 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 29 Apr 2020 14:00:36 +0000 (15:00 +0100)
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>
meta/classes/populate_sdk_base.bbclass

index 6a1ebc8c02e86a4695f71dd17d790e6a74750766..f85c3b9f62795563ee52e98fe26426bbc11829a6 100644 (file)
@@ -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
 }