[oe-commits] [openembedded-core] 01/02: webkitgtk: Fix errors when api-documentation is enabled

git at git.openembedded.org git at git.openembedded.org
Tue Feb 18 13:59:29 UTC 2020


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 0586fcdc048d8c9e8b63a954fef2de05ff53400b
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Feb 18 13:27:48 2020 +0000

    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.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-sato/webkit/webkitgtk_2.26.4.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.4.bb
index c7f0d5e..3eb27a1 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"
 PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2"
 PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
 
+# webkitgtk is full of /usr/bin/env python, particular for generating docs
+do_configure[postfuncs] += "setup_python_link"
+setup_python_link() {
+	ln -s `which python3` ${STAGING_BINDIR_NATIVE}/python
+}
+
 EXTRA_OECMAKE = " \
 		-DPORT=GTK \
 		-DCMAKE_BUILD_TYPE=Release \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list