]> code.ossystems Code Review - openembedded-core.git/commitdiff
webkitgtk: Use ON/OFF for cmake switches.
authorCarlos Alberto Lopez Perez <clopez@igalia.com>
Thu, 1 Oct 2015 13:49:49 +0000 (15:49 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 1 Oct 2015 16:52:43 +0000 (17:52 +0100)
  * 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>
meta/recipes-sato/webkit/webkitgtk_2.8.5.bb

index 859d0cb6610061b0a53c62a12fe39a3113e0a58f..e92c6b140239a229f406ece9df19a0d7d5c3985e 100644 (file)
@@ -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"