diff options
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb index 953fba501a..5e71c81cca 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb | |||
@@ -29,6 +29,7 @@ def find_meson_cross_files(d): | |||
29 | if bb.data.inherits_class('native', d): | 29 | if bb.data.inherits_class('native', d): |
30 | return "" | 30 | return "" |
31 | 31 | ||
32 | corebase = d.getVar("COREBASE") | ||
32 | import collections | 33 | import collections |
33 | sitedata = siteinfo_data(d) | 34 | sitedata = siteinfo_data(d) |
34 | # filename -> found | 35 | # filename -> found |
@@ -36,7 +37,7 @@ def find_meson_cross_files(d): | |||
36 | for path in d.getVar("FILESPATH").split(":"): | 37 | for path in d.getVar("FILESPATH").split(":"): |
37 | for element in sitedata: | 38 | for element in sitedata: |
38 | filename = os.path.join(path, "meson.cross.d", element) | 39 | filename = os.path.join(path, "meson.cross.d", element) |
39 | files[filename] = os.path.exists(filename) | 40 | files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) |
40 | 41 | ||
41 | items = ["--cross-file=" + k for k,v in files.items() if v] | 42 | items = ["--cross-file=" + k for k,v in files.items() if v] |
42 | d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) | 43 | d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) |