summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-04-27 17:28:05 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-16 14:08:29 +0100
commit368ed227ae0b09a8b4bc277eb7b568d2c5af99e7 (patch)
tree234c1af362ce9fe8595743ddb47b7a9af59ff65b
parent3e79377a5bef71b6c8d5b3d6bb9a01205b4fbdf9 (diff)
downloadpoky-368ed227ae0b09a8b4bc277eb7b568d2c5af99e7.tar.gz
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>
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.16.1.bb7
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 4443a5941b..0931a50636 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
26 26
27inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc 27inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
28 28
29# We cannot inherit pythonnative because that would conflict with inheriting python3native
30# (which is done by gobject-introspection). But webkit only needs the path to native Python 2.x binary
31# so we simply set it explicitly here.
32EXTRANATIVEPATH += "python-native"
33
34# depends on libxt 29# depends on libxt
35REQUIRED_DISTRO_FEATURES = "x11" 30REQUIRED_DISTRO_FEATURES = "x11"
36 31
@@ -39,7 +34,6 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
39 pango icu bison-native gawk intltool-native libwebp \ 34 pango icu bison-native gawk intltool-native libwebp \
40 atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \ 35 atk udev harfbuzz jpeg libpng pulseaudio librsvg libtheora libvorbis libxcomposite libxtst \
41 ruby-native libnotify gstreamer1.0-plugins-bad \ 36 ruby-native libnotify gstreamer1.0-plugins-bad \
42 python-native \
43 " 37 "
44 38
45PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ 39PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \
@@ -65,6 +59,7 @@ EXTRA_OECMAKE = " \
65 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ 59 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
66 ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ 60 ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \
67 -DENABLE_MINIBROWSER=ON \ 61 -DENABLE_MINIBROWSER=ON \
62 -DPYTHON_EXECUTABLE=`which python` \
68 " 63 "
69 64
70# Javascript JIT is not supported on powerpc 65# Javascript JIT is not supported on powerpc