diff options
| author |   Ross Burton <ross.burton@intel.com> | 2019-03-21 12:44:09 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-24 16:59:43 +0000 |
| commit | 3d97cddeec8635988e414e6854d850cea20bcb36 (patch) | |
| tree | ce57ae7ed7be02582c999e7f5cc0642e5cfaed6f /meta/recipes-devtools/meson/meson.inc | |
| parent | 669ddafcc9f363cbb81d4b71649241257785a840 (diff) | |
| download | openembedded-core-contrib-3d97cddeec8635988e414e6854d850cea20bcb36.tar.gz | |
meson: support multiple cross configuration files
For historical reasons Meson supports only a single cross configuration file but
multiple native configuration files. Add support for multiple cross files, so
that recipes such as glib can use the toolchain cross file and extend it with a
recipe-specific cross file containing values needed to build.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson.inc')
| -rw-r--r-- | meta/recipes-devtools/meson/meson.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index ca448b00a0..2d18f72c0c 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -11,10 +11,11 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0003-native_bindir.patch \ file://0001-python-module-do-not-manipulate-the-environment-when.patch \ file://disable-rpath-handling.patch \ - file://cross-libdir.patch \ file://0001-modules-windows-split-WINDRES-env-variable.patch \ file://0002-environment.py-detect-windows-also-if-the-system-str.patch \ file://cross-prop-default.patch \ + file://many-cross.patch \ + file://cross-libdir.patch \ " SRC_URI[sha256sum] = "ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd" SRC_URI[md5sum] = "0267b0871266056184c484792572c682" |