From a70f6611baaf6705b85b73feff7babc2494efcbd Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 13 Jun 2016 16:11:25 +0300 Subject: webkitgtk: do not inherit pythonnative Set the path to python 2.x explicitly instead; pythonnative and python3native classes cannot be used in the same recipe. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.12.3.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb index 265fedb349..a77b086eb3 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb @@ -21,10 +21,12 @@ SRC_URI = "\ SRC_URI[md5sum] = "aebb4029c09dd81664aa830e4a584c85" SRC_URI[sha256sum] = "173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307" -# pythonnative must come after gobject-introspection, otherwise -# webkit build configuration will not attempt to find Python 2.x after -# finding (and rejecting) Python 3.x -inherit cmake lib_package pkgconfig gobject-introspection perlnative pythonnative distro_features_check upstream-version-is-even +inherit cmake lib_package pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even + +# We cannot inherit pythonnative because that would conflict with inheriting python3native +# (which is done by gobject-introspection). But webkit only needs the path to native Python 2.x binary +# so we simply set it explicitly here. +EXTRANATIVEPATH += "python-native" # depends on libxt REQUIRED_DISTRO_FEATURES = "x11" -- cgit 1.2.3-korg