diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-18 13:27:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-18 23:53:54 +0000 |
commit | feaf175b6c20be4325a46dbbc9728ee1db932614 (patch) | |
tree | 1eaf2cbd19d68e504e60bc3b141999bac809a466 /meta/recipes-sato | |
parent | b3702d5aeb2fb2134ef305b7e7c6121aa0607b57 (diff) | |
download | poky-feaf175b6c20be4325a46dbbc9728ee1db932614.tar.gz |
webkitgtk: Fix errors when api-documentation is enabled
This recipe hasn't built correctly since we removed "python" from HOSTTOOLS
when api-documentation is enabled.
Add in an extra symlink to "python" rather than trying to fix the multiple
scripts in webkit to refer to python3.
The autobuilder didn't detect this as wekbkit was excluded from the API docs
world build but that is changed now so this fixes build failures.
(From OE-Core rev: c9e520e0996ab524e38de19a22b64395d14c635a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb index c7f0d5e983..3eb27a1550 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | |||
@@ -58,6 +58,12 @@ PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" | |||
58 | PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" | 58 | PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" |
59 | PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" | 59 | PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" |
60 | 60 | ||
61 | # webkitgtk is full of /usr/bin/env python, particular for generating docs | ||
62 | do_configure[postfuncs] += "setup_python_link" | ||
63 | setup_python_link() { | ||
64 | ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python | ||
65 | } | ||
66 | |||
61 | EXTRA_OECMAKE = " \ | 67 | EXTRA_OECMAKE = " \ |
62 | -DPORT=GTK \ | 68 | -DPORT=GTK \ |
63 | -DCMAKE_BUILD_TYPE=Release \ | 69 | -DCMAKE_BUILD_TYPE=Release \ |