[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5872/8267] webkitgtk: remove native python dependency
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 5872/8267] webkitgtk: remove native python dependency
- Date: Sun, 17 Dec 2017 04:02:56 +0000 (UTC)
commit 368ed227ae0b09a8b4bc277eb7b568d2c5af99e7
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date: Thu Apr 27 17:28:05 2017 +0300
webkitgtk: remove native python dependency
Using host python seems to be fine.
(From OE-Core rev: 7cf80640f53bd8faa4874c2dad5f630a935475f6)
Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
Signed-off-by: Ross Burton <ross burton intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/recipes-sato/webkit/webkitgtk_2.16.1.bb | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb
index 4443a59..0931a50 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb
@@ -26,11 +26,6 @@ SRC_URI[sha256sum] = "eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed4676
inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even
gtk-doc
-# 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"
@@ -39,7 +34,6 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
pango icu bison-native gawk intltool-native libwebp \
atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \
ruby-native libnotify gstreamer1.0-plugins-bad \
- python-native \
"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
@@ -65,6 +59,7 @@ EXTRA_OECMAKE = " \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON',
'-DENABLE_INTROSPECTION=OFF', d)} \
${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF',
d)} \
-DENABLE_MINIBROWSER=ON \
+ -DPYTHON_EXECUTABLE=`which python` \
"
# Javascript JIT is not supported on powerpc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]