summaryrefslogtreecommitdiffstats
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:52:43 +0100
commit04a1030951f14b95abe917e53116021ebc6c4396 (patch)
tree8bdaf69dee89eac2dfcc79016ea71048e958c754
parent9c9fd32105bd1a5e1c01f9dd5d1a56ceef12554e (diff)
downloadopenembedded-core-contrib-04a1030951f14b95abe917e53116021ebc6c4396.tar.gz
openembedded-core-contrib-04a1030951f14b95abe917e53116021ebc6c4396.tar.bz2
openembedded-core-contrib-04a1030951f14b95abe917e53116021ebc6c4396.zip
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 [...] 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>
-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',
EXTRA_OECMAKE = " \
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
- -DENABLE_INTROSPECTION=False \
- -DENABLE_MINIBROWSER=True \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-DENABLE_WEBGL=True', '-DENABLE_WEBGL=False', d)} \
+ -DENABLE_INTROSPECTION=OFF \
+ -DENABLE_MINIBROWSER=ON \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-DENABLE_WEBGL=ON', '-DENABLE_WEBGL=OFF', d)} \
"
# Javascript JIT is not supported on powerpc
-EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=False "
-EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=False "
+EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF "
+EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF "
# ARM JIT code does not build on ARMv5/6 anymore, apparently they test only on v7 onwards
-EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=False "
-EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=False "
+EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=OFF "
+EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF "
# binutils 2.25.1 has a bug on aarch64:
# https://sourceware.org/bugzilla/show_bug.cgi?id=18430
-EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=False "
+EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF "
# JIT not supported on MIPS either
-EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=False "
-EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=False "
+EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=OFF "
+EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF "
FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
FILES_${PN}-dbg += "${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so"