summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-03-02 20:32:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-06 22:39:03 +0000
commit57077fa9313907719dba714a9a13bbda3086ec1b (patch)
tree58059c5d14939a97c071ed14a7fdeb21071f963c /meta
parent80e46c7fb8a44bc4c21de7d6b188ef3785af731f (diff)
downloadpoky-57077fa9313907719dba714a9a13bbda3086ec1b.tar.gz
glib-2.0: call os.path.normpath on THISDIR
* some build environments have relative paths in THISDIR, e.g. from OEROOT set in: https://github.com/96boards/oe-rpb-manifest/blob/1e3345c26c56f77f3a15a3978f412a25955d2606/conf/bblayers.conf#L4 and then the paths in filename normalized in: filename = os.path.normpath(os.path.join(path, meson.cross.d, element)) don't match. * COREBASE used here before didn't have this issue because the value is already normalized when set in: meta/conf/layer.conf:COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}' (From OE-Core rev: 7977ff07d181d269bd52f98852d1076b268db614) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb
index 882a89da7a..a2fa5345b4 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb
@@ -31,7 +31,7 @@ def find_meson_cross_files(d):
31 if bb.data.inherits_class('native', d): 31 if bb.data.inherits_class('native', d):
32 return "" 32 return ""
33 33
34 thisdir = d.getVar("THISDIR") 34 thisdir = os.path.normpath(d.getVar("THISDIR"))
35 import collections 35 import collections
36 sitedata = siteinfo_data(d) 36 sitedata = siteinfo_data(d)
37 # filename -> found 37 # filename -> found