[GTK] Make it possible to build with FTL enabled

https://bugs.webkit.org/show_bug.cgi?id=133219

Reviewed by Philippe Normand.

.:
Add LLVM and LIBCXXABI as dependencies when building with FTL enabled.

* Source/cmake/OptionsGTK.cmake:

Tools:
* gtk/jhbuild-optional.modules: Add llvm from svn and build the
same revision than mac.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@169418 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index a7c471b..9e99fe1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-05-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Make it possible to build with FTL enabled
+        https://bugs.webkit.org/show_bug.cgi?id=133219
+
+        Reviewed by Philippe Normand.
+
+        Add LLVM and LIBCXXABI as dependencies when building with FTL enabled.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2014-05-28  Jaehun Lim  <ljaehun.lim@samsung.com>
 
         [CMake] Clean up FAST_MOBILE_SCROLLING

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 88cc502..abca530 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -260,6 +260,12 @@ if (ENABLE_GAMEPAD)
     find_package(GUdev)
 endif ()
 
+if (ENABLE_FTL_JIT)
+    find_package(LLVM REQUIRED)
+    find_package(LIBCXXABI REQUIRED)
+    set(HAVE_LLVM ON)
+endif ()
+
 set(CPACK_SOURCE_GENERATOR TBZ2)
 
 set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 07a58b6..b789832 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2014-05-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Make it possible to build with FTL enabled
+        https://bugs.webkit.org/show_bug.cgi?id=133219
+
+        Reviewed by Philippe Normand.
+
+        * gtk/jhbuild-optional.modules: Add llvm from svn and build the
+        same revision than mac.
+
 2014-05-27  Michael Saboff  <msaboff@apple.com>
 
         REGRESSION(r169265): sh: line 0: cd: ../.vm

diff --git a/Tools/gtk/jhbuild-optional.modules b/Tools/gtk/jhbuild-optional.modules
index 91fb829..e49c623 100644 (file)
--- a/Tools/gtk/jhbuild-optional.modules
+++ b/Tools/gtk/jhbuild-optional.modules
@@ -9,6 +9,8 @@
 
   <repository type="tarball" name="ftp.gnome.org"
       href="http://ftp.gnome.org"/>
+  <repository type="svn" name="llvm.org"
+      href="http://llvm.org/svn/llvm-project/llvm/"/>
 
   <autotools id="libsecret" autogen-sh="configure">
     <branch repo="ftp.gnome.org"
@@ -42,4 +44,9 @@
     </dependencies>
   </autotools>
 
+  <autotools id="llvm" autogenargs="--enable-optimized --disable-terminfo --disable-zlib">
+    <branch repo="llvm.org" module="trunk" checkoutdir="llvm" version="r206311"
+            revision="206311"/>
+  </autotools>
+
 </moduleset>