summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorCarlos Alberto Lopez Perez <clopez@igalia.com>2015-10-01 15:49:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 17:54:55 +0100
commitd5ce2f50a61e40cd97ebb83f70fbceb3e6014032 (patch)
tree1f61d065a86025b27c5667c92adf74f4ae56668a /meta/recipes-sato/webkit
parentebd5035a7bb6afc755e13908e62fbde5aec53581 (diff)
downloadpoky-d5ce2f50a61e40cd97ebb83f70fbceb3e6014032.tar.gz
webkitgtk: Use ON/OFF for cmake switches.
* This is a cosmetic patch. * Using ON/OFF instead of True/False is exactly the same for cmake (is case insensitive). * But WebKitGTK+ preffers (and uses) the first option. So when you check which values were enabled for the build (at log.do_configure) you will see that every option that was not modified will print either OFF or ON, meanwhile the options modified by this recipe will print True or False. For example: [...] -- ENABLE_THREADED_COMPOSITOR OFF -- ENABLE_PLUGIN_PROCESS_GTK2 .............. ON -- ENABLE_MINIBROWSER True [...] (From OE-Core rev: 04a1030951f14b95abe917e53116021ebc6c4396) Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.8.5.bb20
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
index 859d0cb661..e92c6b1402 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
@@ -34,26 +34,26 @@ DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl',
34EXTRA_OECMAKE = " \ 34EXTRA_OECMAKE = " \
35 -DPORT=GTK \ 35 -DPORT=GTK \
36 -DCMAKE_BUILD_TYPE=Release \ 36 -DCMAKE_BUILD_TYPE=Release \
37 -DENABLE_INTROSPECTION=False \ 37 -DENABLE_INTROSPECTION=OFF \
38 -DENABLE_MINIBROWSER=True \ 38 -DENABLE_MINIBROWSER=ON \
39 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-DENABLE_WEBGL=True', '-DENABLE_WEBGL=False', d)} \ 39 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-DENABLE_WEBGL=ON', '-DENABLE_WEBGL=OFF', d)} \
40 " 40 "
41 41
42# Javascript JIT is not supported on powerpc 42# Javascript JIT is not supported on powerpc
43EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=False " 43EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF "
44EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=False " 44EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF "
45 45
46# ARM JIT code does not build on ARMv5/6 anymore, apparently they test only on v7 onwards 46# ARM JIT code does not build on ARMv5/6 anymore, apparently they test only on v7 onwards
47EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=False " 47EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=OFF "
48EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=False " 48EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF "
49 49
50# binutils 2.25.1 has a bug on aarch64: 50# binutils 2.25.1 has a bug on aarch64:
51# https://sourceware.org/bugzilla/show_bug.cgi?id=18430 51# https://sourceware.org/bugzilla/show_bug.cgi?id=18430
52EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=False " 52EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF "
53 53
54# JIT not supported on MIPS either 54# JIT not supported on MIPS either
55EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=False " 55EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=OFF "
56EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=False " 56EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF "
57 57
58FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" 58FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
59FILES_${PN}-dbg += "${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so" 59FILES_${PN}-dbg += "${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so"