MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

meson: split template generation

Browse Source 
Split the template generation function into two functions, one for cross
and another for native.

(From OE-Core rev: 3c4d2fc7ef38042737f64e9e44355839ab551b55)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2025-05-10 09:43:54 +01:00 committed by Richard Purdie
parent e07389d1be
commit 5c194e28b9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta/recipes-devtools/meson/meson_1.8.0.bb
View File

@ -65,7 +65,7 @@ def generate_native_link_template(d):
return repr(val) return repr(val)
install_templates() { install_native_template() {
install -d ${D}${datadir}/meson install -d ${D}${datadir}/meson
cat >${D}${datadir}/meson/meson.native.template <<EOF cat >${D}${datadir}/meson/meson.native.template <<EOF
@ -83,9 +83,14 @@ c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2s
c_link_args = ${@generate_native_link_template(d)} c_link_args = ${@generate_native_link_template(d)}
cpp_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}] cpp_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}]
cpp_link_args = ${@generate_native_link_template(d)} cpp_link_args = ${@generate_native_link_template(d)}
[properties] [properties]
sys_root = '@OECORE_NATIVE_SYSROOT' sys_root = '@OECORE_NATIVE_SYSROOT'
EOF EOF
}
install_cross_template() {
install -d ${D}${datadir}/meson
cat >${D}${datadir}/meson/meson.cross.template <<EOF cat >${D}${datadir}/meson/meson.cross.template <<EOF
[binaries] [binaries]
@ -115,7 +120,8 @@ EOF
} }
do_install:append:class-nativesdk() { do_install:append:class-nativesdk() {
install_templates install_native_template
install_cross_template
install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
install -m 0755 ${UNPACKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ install -m 0755 ${UNPACKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/
@ -128,7 +134,8 @@ do_install:append:class-nativesdk() {
FILES:${PN}:append:class-nativesdk = "${datadir}/meson ${SDKPATHNATIVE}" FILES:${PN}:append:class-nativesdk = "${datadir}/meson ${SDKPATHNATIVE}"
do_install:append:class-native() { do_install:append:class-native() {
install_templates install_native_template
install_cross_template
install -d ${D}${datadir}/post-relocate-setup.d install -d ${D}${datadir}/post-relocate-setup.d
install -m 0755 ${UNPACKDIR}/meson-setup.py ${D}${datadir}/post-relocate-setup.d/ install -m 0755 ${UNPACKDIR}/meson-setup.py ${D}${datadir}/post-relocate-setup.d/