mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 00:32:12 +02:00
meson: clean up the native template in nativesdk builds
In a nativesdk build, the native build template should be minimal as it just needs to ensure that Meson can link with libraries in the SDK's native sysroot. Specifically, it shouldn't be passing BUILD_* flags to Meson as these are for the Yocto build host, not the SDK user. (From OE-Core rev: f13063d11f1c62152af9ed45cb24f6499262e1a2) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
298e445560
commit
84ca7c6619
@@ -86,6 +86,21 @@ cpp_link_args = ${@generate_native_link_template(d)}
|
||||
EOF
|
||||
}
|
||||
|
||||
install_nativesdk_template() {
|
||||
install -d ${D}${datadir}/meson
|
||||
|
||||
cat >${D}${datadir}/meson/meson.native.template <<EOF
|
||||
[binaries]
|
||||
pkg-config = 'pkg-config-native'
|
||||
|
||||
[built-in options]
|
||||
c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}']
|
||||
c_link_args = ['-L@{OECORE_NATIVE_SYSROOT}${libdir_native}', '-L@{OECORE_NATIVE_SYSROOT}${base_libdir_native}',]
|
||||
cpp_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}']
|
||||
cpp_link_args = ['-L@{OECORE_NATIVE_SYSROOT}${libdir_native}', '-L@{OECORE_NATIVE_SYSROOT}${base_libdir_native}',]
|
||||
EOF
|
||||
}
|
||||
|
||||
install_cross_template() {
|
||||
install -d ${D}${datadir}/meson
|
||||
|
||||
@@ -117,7 +132,7 @@ EOF
|
||||
}
|
||||
|
||||
do_install:append:class-nativesdk() {
|
||||
install_native_template
|
||||
install_nativesdk_template
|
||||
install_cross_template
|
||||
|
||||
install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
|
||||
|
||||
Reference in New Issue
Block a user