diff options
| author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2020-04-28 15:57:47 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-29 15:02:19 +0100 |
| commit | 2aa51e2e3146a0719e384b5c7af29774cd64d5ff (patch) | |
| tree | 96b9835ab63fe9416aec0643ad755a31242f0515 /meta/classes | |
| parent | a3b21540c3213078a8c917b29f5ce321ccb7031d (diff) | |
| download | poky-2aa51e2e3146a0719e384b5c7af29774cd64d5ff.tar.gz | |
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.
(From OE-Core rev: a6077e87f4eeb89b0617883c9c01e08219ae44dc)
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
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() { | |||
| 187 | sed -i -e "s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:" ${SDK_OUTPUT}/${SDKPATH}/relocate_sdk.py | 187 | sed -i -e "s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:" ${SDK_OUTPUT}/${SDKPATH}/relocate_sdk.py |
| 188 | 188 | ||
| 189 | mkdir -p ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/ | 189 | mkdir -p ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/ |
| 190 | echo '${SDKPATHNATIVE}${libdir} | 190 | echo '${SDKPATHNATIVE}${libdir_nativesdk} |
| 191 | ${SDKPATHNATIVE}${base_libdir} | 191 | ${SDKPATHNATIVE}${base_libdir_nativesdk} |
| 192 | include /etc/ld.so.conf' > ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/ld.so.conf | 192 | include /etc/ld.so.conf' > ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/ld.so.conf |
| 193 | } | 193 | } |
| 194 | 194 | ||
