]> code.ossystems Code Review - openembedded-core.git/commit
meson: fix nativesdk-meson for multilib SDKs
authorRoss Burton <ross.burton@intel.com>
Mon, 7 Jan 2019 15:07:43 +0000 (15:07 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 7 Jan 2019 17:45:40 +0000 (17:45 +0000)
commit8596f871ef834a38e3375443f7eb08e43816347a
tree48e33b1f1cc368e301052c97b603ae3a38d28262
parentfdb5a8b3d437537aee53380091dabe6258667a49
meson: fix nativesdk-meson for multilib SDKs

Multilib SDKs differ only in the environment variables set, so nativesdk-meson's
setup script needs to write a cross file for each environment.

Rename the shipped meson.cross to meson.cross.template, as it cannot be used
directly.  Now that post-relocate scripts are called once for each environment,
the generated meson.cross can be prefixed with TARGET_PREFIX to ensure it is
unique.

Finally rewrite the setup script to use string.Template to perform the expansion
instead of hand-coding the logic.

Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-devtools/meson/meson/meson-setup.py
meta/recipes-devtools/meson/meson/meson-wrapper
meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb