diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/classes/meson.bbclass | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/meson.bbclass')
-rw-r--r-- | meta/classes/meson.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 8ae0285f72..2beed89d11 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass | |||
@@ -1,6 +1,6 @@ | |||
1 | inherit python3native meson-routines | 1 | inherit python3native meson-routines |
2 | 2 | ||
3 | DEPENDS_append = " meson-native ninja-native" | 3 | DEPENDS:append = " meson-native ninja-native" |
4 | 4 | ||
5 | # As Meson enforces out-of-tree builds we can just use cleandirs | 5 | # As Meson enforces out-of-tree builds we can just use cleandirs |
6 | B = "${WORKDIR}/build" | 6 | B = "${WORKDIR}/build" |
@@ -29,11 +29,11 @@ MESONOPTS = " --prefix ${prefix} \ | |||
29 | --wrap-mode nodownload \ | 29 | --wrap-mode nodownload \ |
30 | --native-file ${WORKDIR}/meson.native" | 30 | --native-file ${WORKDIR}/meson.native" |
31 | 31 | ||
32 | EXTRA_OEMESON_append = " ${PACKAGECONFIG_CONFARGS}" | 32 | EXTRA_OEMESON:append = " ${PACKAGECONFIG_CONFARGS}" |
33 | 33 | ||
34 | MESON_CROSS_FILE = "" | 34 | MESON_CROSS_FILE = "" |
35 | MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" | 35 | MESON_CROSS_FILE:class-target = "--cross-file ${WORKDIR}/meson.cross" |
36 | MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" | 36 | MESON_CROSS_FILE:class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" |
37 | 37 | ||
38 | addtask write_config before do_configure | 38 | addtask write_config before do_configure |
39 | do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS" | 39 | do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS" |