[oe-commits] [meta-openembedded] 46/46: webkit-efl: fix build with newer CMake 3.4 from oe-core

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master
in repository meta-openembedded.

commit da5addc87b01279f63b7e2cc29c2b5233a669474
Author: Martin Jansa <Martin.Jansa at gmail.com>
AuthorDate: Wed Jan 27 18:43:00 2016 +0100

    webkit-efl: fix build with newer CMake 3.4 from oe-core
    
    * cmake was upgraded in:
      commit 2a6e061712cfe9cb4738806a0c351a64e0d30144
      Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
      Date:   Fri Jan 22 15:37:32 2016 +0200
    
        cmake: update to 3.4.2
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 ...sEfl.cmake-Fix-build-with-newer-CMake-3.4.patch | 30 ++++++++++++++++++++++
 meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb   |  1 +
 2 files changed, 31 insertions(+)

diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0006-OptionsEfl.cmake-Fix-build-with-newer-CMake-3.4.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0006-OptionsEfl.cmake-Fix-build-with-newer-CMake-3.4.patch
new file mode 100644
index 0000000..0562634
--- /dev/null
+++ b/meta-efl/recipes-efl/webkit/webkit-efl/0006-OptionsEfl.cmake-Fix-build-with-newer-CMake-3.4.patch
@@ -0,0 +1,30 @@
+From 993882f81fe991b8baf1099392703337cc13fac0 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Wed, 27 Jan 2016 18:40:23 +0100
+Subject: [PATCH] OptionsEfl.cmake: Fix build with newer CMake 3.4
+
+* otherwise it fails with:
+  | CMake Error at Source/cmake/OptionsEfl.cmake:251 (CHECK_INCLUDE_FILES):
+  |   Unknown CMake command "CHECK_INCLUDE_FILES".
+* https://bugs.webkit.org/show_bug.cgi?id=150117
+
+Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
+---
+ Source/cmake/OptionsEfl.cmake | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
+index 1aa9002..05216d0 100644
+--- a/Source/cmake/OptionsEfl.cmake
++++ b/Source/cmake/OptionsEfl.cmake
+@@ -253,6 +253,7 @@ if (ENABLE_WEBGL OR WTF_USE_TILED_BACKING_STORE)
+         set(WTF_USE_EGL 1)
+         add_definitions(-DWTF_USE_EGL=1)
+     else ()
++        include(CheckIncludeFiles)
+         CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
+         add_definitions(-DWTF_USE_GLX=1)
+     endif ()
+-- 
+2.7.0
+
diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb b/meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb
index 07cbd89..96ad830 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_1.11.0.bb
@@ -6,6 +6,7 @@ SRC_URI += "\
     file://0003-FEBlendNEON.h-fix-missing-semicolon.patch \
     file://0004-Fix-the-build-with-EFL-1.12-https-bugs.webkit.org-sh.patch \
     file://0005-Fix-the-build-with-cmake-3.patch \
+    file://0006-OptionsEfl.cmake-Fix-build-with-newer-CMake-3.4.patch \
 "
 SRC_URI[md5sum] = "90fa970ebf8646319d292c2bb5bff5db"
 SRC_URI[sha256sum] = "d8d21e27f4a21cd77c41914548c184ddb98693ba23851aa66c8e51c0be4b90b7"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.