From 4c92a0baca78f63f921ae272bc4f970f67edb189 Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Tue, 10 Feb 2015 09:56:30 -0300
Subject: deps: Add Luajit compilation flags to improve debugging

---
 test/functional/helpers.lua | 5 -----
 third-party/CMakeLists.txt  | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index e63c79ec80..ea98ff4ce3 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -1,8 +1,3 @@
-if jit then
-  -- Disable JIT because of random errors on Travis with OS X.
-  jit.off(true, true)
-end
-
 require('coxpcall')
 local Loop = require('nvim.loop')
 local MsgpackStream = require('nvim.msgpack_stream')
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 19fc348c04..6b9cf565b2 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -202,6 +202,10 @@ if(USE_BUNDLED_LUAJIT)
     INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
                                 PREFIX=${DEPS_INSTALL_DIR}
                                 CFLAGS=-fPIC
+                                CFLAGS+=-DLUAJIT_DISABLE_JIT
+                                CFLAGS+=-DLUA_USE_APICHECK
+                                CFLAGS+=-DLUA_USE_ASSERT
+                                CCDEBUG+=-g
                                 BUILDMODE=static
                                 install)
   list(APPEND THIRD_PARTY_DEPS luajit)
-- 
cgit 


From daba57c51236c77e0b53e4028672aee3c2a59c1b Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Tue, 10 Feb 2015 10:57:15 -0300
Subject: deps: Update lua-client

The new version sets a custom panic function that prints the lua traceback
before exiting.
---
 third-party/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 6b9cf565b2..46955d5e8f 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -267,7 +267,7 @@ if(USE_BUNDLED_LUAROCKS)
 
   add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client
     COMMAND ${DEPS_BIN_DIR}/luarocks
-    ARGS build https://raw.githubusercontent.com/neovim/lua-client/af161f5f89c7877d0f650b5de6b3a6126b38f012/nvim-client-0.0.1-10.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} LIBUV_DIR=${DEPS_INSTALL_DIR}
+    ARGS build https://raw.githubusercontent.com/neovim/lua-client/fabecc56a7c7a3fc15fe6a1a765b58d61bc8e922/nvim-client-0.0.1-11.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} LIBUV_DIR=${DEPS_INSTALL_DIR}
     DEPENDS lpeg libuv)
   add_custom_target(nvim-client
     DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client)
-- 
cgit