unmaintained/tarantool: move from testing

* Disabled on all arches
* Doesn't have a maintainer
* Still requires python2

7 files changed, 0 insertions, 487 deletions

diff --git a/testing/tarantool/APKBUILD b/testing/tarantool/APKBUILD
deleted file mode 100644
index 177b7cec63..0000000000
--- a/testing/tarantool/APKBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer:
-pkgname=tarantool
-pkgver=1.7.4.335
-_series=${pkgver%.*}; _series=${_series%.*}  # x.y
-pkgrel=8
-pkgdesc="Lua application server integrated with a database management system"
-url="https://tarantool.org"
-# x86, aarch64: fails to build
-# armhf: zstd not available (fails to build)
-# ppc64le: not supported by LuaJIT w/o patches
-# s390x: not supported by LuaJIT
-arch=""
-license="BSD-2-Clause MIT Public-Domain"
-pkgusers="$pkgname"
-pkggroups="$pkgname"
-install="$pkgname.pre-install"
-checkdepends="python2-dev py2-argparse py2-gevent py2-msgpack py2-six py2-yaml"
-makedepends="cmake curl-dev luajit-dev libcoro-dev openssl-dev msgpuck-dev
-        perl python2 readline-dev yaml-dev zstd-dev"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://download.tarantool.org/tarantool/$_series/src/$pkgname-$pkgver.tar.gz
-        $pkgname.initd
-        unbundle-dependencies.patch
-        tests-musl-compat.patch
-        tests-libressl-compat.patch
-        fix-compilation-with-libcurl-7.62.0.patch
-        "
-builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-        default_prepare
-        cd "$builddir"
-
-        # XXX: This test doesn't work, probably due to fakeroot.
-        rm test/xlog-py/misc.test.py
-
-        # msgpuck.h is in /usr/include, not /usr/include/msgpuck.
-        find . -name '*.c' -o -name '*.cc' \
-                | xargs -n 1 sed -Ei 's|#include\s*["<]msgpuck/msgpuck\.h[">]|#include <msgpuck.h>|'
-
-        # Remove bundled libraries.
-        rm -r src/lib/msgpuck
-        cd third_party
-        rm -r coro libyaml zstd
-}
-
-build() {
-        cd "$builddir"
-
-        # Bundled libraries:
-        # - libgopt (Public Domain): probably patched, it does not correspond
-        #   to 8.1 as stated in header
-        # - luajit (MIT): tarantool requires non-exported symbols, so cannot link
-        #   dynamically; linking with system static libluajit doesn't work too
-        cmake \
-                -DCMAKE_BUILD_TYPE=None \
-                -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-                -DCMAKE_C_FLAGS="$CFLAGS" \
-                -DCMAKE_INSTALL_PREFIX=/usr \
-                -DCMAKE_INSTALL_LIBDIR=lib \
-                -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-                -DCMAKE_SKIP_RPATH=ON \
-                -DCMAKE_VERBOSE_MAKEFILE=ON \
-                -DENABLE_BUNDLED_LIBCORO=OFF \
-                -DENABLE_BUNDLED_LIBGOPT=ON \
-                -DENABLE_BUNDLED_LIBYAML=OFF \
-                -DENABLE_BUNDLED_LUAJIT=ON \
-                -DENABLE_BUNDLED_MSGPUCK=OFF \
-                -DENABLE_BUNDLED_ZSTD=OFF \
-                -DENABLE_DIST=ON \
-                -DWITH_SYSVINIT=OFF \
-                -DWITH_SYSTEMD=OFF
-        make VERBOSE=1 -j2  # there's some problem with parallel build
-}
-
-check() {
-        cd "$builddir"/test
-
-        ../src/tarantool --help > /dev/null
-
-        # TODO: Some tests are broken, fix it!
-        # --force means that it will not stop after first error.
-        #python2 test-run.py --force
-}
-
-package() {
-        cd "$builddir"
-
-        make DESTDIR="$pkgdir" install
-        rm -R "$pkgdir"/etc/default
-
-        install -Dm755 "$srcdir"/tarantool.initd "$pkgdir"/etc/init.d/tarantool
-}
-
-sha512sums="c95a6900d9e9b9963bb038f28f3e47d0f8fd66159efef99b98b792cd08748481043d9a2a39c1c455094725e1ac213df731280587b93746ecb7bea2431deb7bf3  tarantool-1.7.4.335.tar.gz
-fe463c4b6ab8708ea6ec17bb6a887677ae131a489d2ce299ce951790b7c134ff356bc1a4d4745878beec3600ec702944c2329a3f02645f8ab0a0eb24edb6215a  tarantool.initd
-b48eefdf71e20db22c4366e4573441a0d4e5f6e727fc23b2b41534e8d5cc7dc9cc08baf2bf1cf1950c7b0e211920abb4254c2d1e972ec884db25800820824f2c  unbundle-dependencies.patch
-f6fec037780f830eb353b184d190b5dc8b481164c9cd06991f921d70be8cababb5dba43e5af96abe6fb87fda44c5573d706f7b032bc996d33debb7811b84addb  tests-musl-compat.patch
-146744f2e7265de2644c03d7beb6ce1657b63a99db9c4527cb603c915082dc1184a90e92ba39bfb946f2f8f7a2b866cc8343c7e865d4245fe704447a59cc4846  tests-libressl-compat.patch
-db687fee5cc6cc975d560f17abf51a6a258a964ab1322ee5d209a153d98c80263fc36f0ae8e78d480dc9f0fb68d4de1e01174d111eb21e794c89d38934b85b01  fix-compilation-with-libcurl-7.62.0.patch"
diff --git a/testing/tarantool/fix-compilation-with-libcurl-7.62.0.patch b/testing/tarantool/fix-compilation-with-libcurl-7.62.0.patch
deleted file mode 100644
index 41d5cc5382..0000000000
--- a/testing/tarantool/fix-compilation-with-libcurl-7.62.0.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 02da15f7109b8bb7921eb97a751607b9dd2885b2 Mon Sep 17 00:00:00 2001
-From: Vladimir Davydov <vdavydov.dev@gmail.com>
-Date: Thu, 1 Nov 2018 13:35:24 +0300
-Subject: [PATCH] httpc: fix compilation with libcurl >= 7.62.0
-
-Starting from libcurl 7.62.0, CURL_SSL_CACERT is defined as a macro
-alias to CURLE_PEER_FAILED_VERIFICATION, see
-
-  https://github.com/curl/curl/commit/3f3b26d6feb0667714902e836af608094235fca2
-
-This breaks compilation:
-
-  httpc.c:337:7: error: duplicate case value 'CURLE_PEER_FAILED_VERIFICATION'
-          case CURLE_PEER_FAILED_VERIFICATION:
-               ^
-  httpc.c:336:7: note: previous case defined here
-          case CURLE_SSL_CACERT:
-               ^
-  curl.h:589:26: note: expanded from macro 'CURLE_SSL_CACERT'
-  #define CURLE_SSL_CACERT CURLE_PEER_FAILED_VERIFICATION
-                           ^
-
-Fix this by using CURLE_SSL_CACERT only if libcurl version is less
-than 7.62.0.
-
-Note, we can't use CURL_AT_LEAST_VERSION to check libcurl version,
-because it isn't available in libcurl shipped with CentOS 6.
----
- src/httpc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/httpc.c b/src/httpc.c
-index 4d48a313d8..950f8b32f6 100644
---- a/src/httpc.c
-+++ b/src/httpc.c
-@@ -333,7 +333,9 @@ httpc_execute(struct httpc_request *req, double timeout)
-                        ++env->stat.http_other_responses;
-                }
-                break;
--       case CURLE_SSL_CACERT:
-+#if LIBCURL_VERSION_NUM < 0x073e00
-+       case CURLE_SSL_CACERT: /* deprecated in libcurl 7.62.0 */
-+#endif
-        case CURLE_PEER_FAILED_VERIFICATION:
-                /* 495 SSL Certificate Error (nginx non-standard) */
-                req->status = 495;
diff --git a/testing/tarantool/tarantool.initd b/testing/tarantool/tarantool.initd
deleted file mode 100644
index 18bc5c128f..0000000000
--- a/testing/tarantool/tarantool.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-
-INSTANCE=default
-[ "${RC_SVCNAME}" != "${RC_SVCNAME##*.}" ] && INSTANCE=${RC_SVCNAME##*.}
-command="/usr/bin/tarantoolctl"
-command_user="${TARANTOOL_USER:-tarantool}"
-command_args="start ${INSTANCE}"
-pidfile="/run/${INSTANCE}.pid"
-
-depend() {
-        use logger dns
-        need net
-        after firewall
-}
-
-start_pre() {
-        checkpath --owner ${TARANTOOL_USER:-tarantool}:${TARANTOOL_USER:-tarantool} \
-                --directory --mode 0775 /var/log/tarantool /var/run/tarantool
-}
diff --git a/testing/tarantool/tarantool.pre-install b/testing/tarantool/tarantool.pre-install
deleted file mode 100644
index ba1ed08258..0000000000
--- a/testing/tarantool/tarantool.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S tarantool 2>/dev/null
-adduser -S -D -h /var/lib/tarantool -s /sbin/nologin -G tarantool -g tarantool tarantool 2>/dev/null
-
-exit 0
diff --git a/testing/tarantool/tests-libressl-compat.patch b/testing/tarantool/tests-libressl-compat.patch
deleted file mode 100644
index 7816bf406a..0000000000
--- a/testing/tarantool/tests-libressl-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix crypto/digest tests to be compatible with LibreSSL.
-
---- a/test/app/crypto.result
-+++ b/test/app/crypto.result
-@@ -111,13 +111,13 @@
- ...
- ciph.decrypt(enc, bad_pass, iv)
- ---
--- error: 'builtin/crypto.lua:<line>"]: Can''t finalize cipher:error:06065064:digital envelope
--    routines:EVP_DecryptFinal_ex:bad decrypt'
-+- error: 'builtin/crypto.lua:<line>"]: Can''t finalize cipher:error:06FFF064:digital envelope
-+    routines:CRYPTO_internal:bad decrypt'
- ...
- ciph.decrypt(enc, pass, bad_iv)
- ---
--- error: 'builtin/crypto.lua:<line>"]: Can''t finalize cipher:error:06065064:digital envelope
--    routines:EVP_DecryptFinal_ex:bad decrypt'
-+- error: 'builtin/crypto.lua:<line>"]: Can''t finalize cipher:error:06FFF064:digital envelope
-+    routines:CRYPTO_internal:bad decrypt'
- ...
- test_run:cmd("clear filter")
- ---
---- a/test/app/digest.result
-+++ b/test/app/digest.result
-@@ -445,8 +445,8 @@
- ...
- digest.aes256cbc.decrypt(digest.aes256cbc.encrypt('test123', 'passpasspasspasspasspasspasspass', 'iv12tras8712cvbh'), 'nosspasspasspasspasspasspasspass', 'iv12tras8712cvbh')
- ---
--- error: 'builtin/crypto.lua:<line>"]: Can''t finalize cipher:error:06065064:digital envelope
--    routines:EVP_DecryptFinal_ex:bad decrypt'
-+- error: 'builtin/crypto.lua:<line>"]: Can''t finalize cipher:error:06FFF064:digital envelope
-+    routines:CRYPTO_internal:bad decrypt'
- ...
- digest = nil
- ---
diff --git a/testing/tarantool/tests-musl-compat.patch b/testing/tarantool/tests-musl-compat.patch
deleted file mode 100644
index f39fb8735b..0000000000
--- a/testing/tarantool/tests-musl-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix fiber test to be compatible with musl libc.
-
---- a/test/unit/fiber.result
-+++ b/test/unit/fiber.result
-@@ -1,6 +1,6 @@
--#gh-1238: log uncaught errors
--SystemError Failed to allocate 42 bytes in allocator for exception: Cannot allocate memory
-        *** fiber_name_test ***
-+#gh-1238: log uncaught errors
-+SystemError Failed to allocate 42 bytes in allocator for exception: Out of memory
- # name of a new fiber: main.
- 
- # set new fiber name: Horace.
diff --git a/testing/tarantool/unbundle-dependencies.patch b/testing/tarantool/unbundle-dependencies.patch
deleted file mode 100644
index 864873e3f9..0000000000
--- a/testing/tarantool/unbundle-dependencies.patch
+++ /dev/null
@@ -1,266 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -330,18 +330,29 @@
- # in the top level CMakeLists.txt, to ensure a consistent
- # header file layout across the entire project.
- #
--set(ENABLE_BUNDLED_LIBCORO ON)
--include(BuildLibCORO)
--libcoro_build()
--add_dependencies(build_bundled_libs coro)
-+option(ENABLE_BUNDLED_LIBCORO "Enable building of the bundled libcoro" ON)
-+if (ENABLE_BUNDLED_LIBCORO)
-+    include(BuildLibCORO)
-+    libcoro_build()
-+    add_dependencies(build_bundled_libs coro)
-+else()
-+    set(LIBCORO_FIND_REQUIRED ON)
-+    find_package(LibCORO)
-+endif()
- 
- #
- # LibGOPT
- #
- 
--include(BuildLibGOPT)
--libgopt_build()
--add_dependencies(build_bundled_libs gopt)
-+option(ENABLE_BUNDLED_LIBGOPT "Enable building of the bundled gopt" ON)
-+if (ENABLE_BUNDLED_LIBGOPT)
-+    include(BuildLibGOPT)
-+    libgopt_build()
-+    add_dependencies(build_bundled_libs gopt)
-+else()
-+    set(LIBGOPT_FIND_REQUIRED ON)
-+    find_package(LibGOPT)
-+endif()
- 
- #
- # MsgPuck
-@@ -377,11 +388,14 @@
- # zstd
- #
- 
--# Debian: missing zstd_static.h in libzstd-dev
--# Fedora: not found
--# => always use bundled version
--include(BuildZSTD)
--zstd_build()
-+option(ENABLE_BUNDLED_ZSTD "Enable building of the bundled zstd" ON)
-+if (ENABLE_BUNDLED_ZSTD)
-+    include(BuildZSTD)
-+    zstd_build()
-+else()
-+    set(LIBZSTD_FIND_REQUIRED ON)
-+    find_package(ZSTD)
-+endif()
- 
- #
- # OpenSSL
---- /dev/null
-+++ b/cmake/FindLibCORO.cmake
-@@ -0,0 +1,24 @@
-+find_path(LIBCORO_INCLUDE_DIR
-+  NAMES coro.h
-+)
-+
-+find_library(LIBCORO_LIBRARY
-+  NAMES libcoro.a coro
-+)
-+
-+set(LIBCORO_INCLUDE_DIRS "${LIBCORO_INCLUDE_DIR}")
-+set(LIBCORO_LIBRARIES "${LIBCORO_LIBRARY}")
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(LIBCORO REQUIRED_VARS
-+    LIBCORO_LIBRARIES LIBCORO_INCLUDE_DIRS)
-+
-+mark_as_advanced(LIBCORO_LIBRARY LIBCORO_LIBRARIES
-+    LIBCORO_INCLUDE_DIR LIBCORO_INCLUDE_DIRS)
-+
-+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "86" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64"
-+        OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
-+    add_definitions("-DCORO_ASM")
-+else()
-+    add_definitions("-DCORO_SJLJ")
-+endif()
---- /dev/null
-+++ b/cmake/FindLibGOPT.cmake
-@@ -0,0 +1,17 @@
-+find_path(LIBGOPT_INCLUDE_DIR
-+  NAMES gopt.h
-+)
-+
-+find_library(LIBGOPT_LIBRARY
-+  NAMES libgopt.a gopt
-+)
-+
-+set(LIBGOPT_INCLUDE_DIRS "${LIBGOPT_INCLUDE_DIR}")
-+set(LIBGOPT_LIBRARIES "${LIBGOPT_LIBRARY}")
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(LIBGOPT REQUIRED_VARS
-+    LIBGOPT_LIBRARIES LIBGOPT_INCLUDE_DIRS)
-+
-+mark_as_advanced(LIBGOPT_LIBRARY LIBGOPT_LIBRARIES
-+    LIBGOPT_INCLUDE_DIR LIBGOPT_INCLUDE_DIRS)
---- /dev/null
-+++ b/cmake/FindZSTD.cmake
-@@ -0,0 +1,17 @@
-+find_path(ZSTD_INCLUDE_DIR
-+  NAMES zstd.h
-+)
-+
-+find_library(ZSTD_LIBRARY
-+  NAMES zstd
-+)
-+
-+set(ZSTD_INCLUDE_DIRS "${ZSTD_INCLUDE_DIR}")
-+set(ZSTD_LIBRARIES "${ZSTD_LIBRARY}")
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(ZSTD REQUIRED_VARS
-+    ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS)
-+
-+mark_as_advanced(ZSTD_LIBRARY ZSTD_LIBRARIES
-+    ZSTD_INCLUDE_DIR ZSTD_INCLUDE_DIRS)
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -67,7 +67,7 @@
- #include "random.h"
- #include "tt_uuid.h"
- #include "iobuf.h"
--#include <third_party/gopt/gopt.h>
-+#include <gopt.h>
- #include "cfg.h"
- #include "version.h"
- #include <readline/readline.h>
---- a/src/fiber.h
-+++ b/src/fiber.h
-@@ -44,7 +44,7 @@
- #include "small/rlist.h"
- #include "salad/stailq.h"
- 
--#include <third_party/coro/coro.h>
-+#include <coro.h>
- 
- #if defined(__cplusplus)
- extern "C" {
---- a/src/opts.c
-+++ b/src/opts.c
-@@ -31,7 +31,7 @@
- #include "trivia/config.h"
- #include <stddef.h>
- 
--#include <third_party/gopt/gopt.h>
-+#include <gopt.h>
- 
- const void *opt_def =
-        gopt_start(
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -47,15 +47,15 @@
- lua_source(lua_sources lua/httpc.lua)
- lua_source(lua_sources lua/iconv.lua)
- # LuaJIT jit.* library
--lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/bc.lua")
--lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/bcsave.lua")
--lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/dis_x86.lua")
--lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/dis_x64.lua")
--lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/dump.lua")
--lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/vmdef.lua")
--lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/v.lua")
--lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/p.lua")
--lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/zone.lua")
-+lua_source(lua_sources "${LUAJIT_JITLIB_DIR}/bc.lua")
-+lua_source(lua_sources "${LUAJIT_JITLIB_DIR}/bcsave.lua")
-+lua_source(lua_sources "${LUAJIT_JITLIB_DIR}/dis_x86.lua")
-+lua_source(lua_sources "${LUAJIT_JITLIB_DIR}/dis_x64.lua")
-+lua_source(lua_sources "${LUAJIT_JITLIB_DIR}/dump.lua")
-+lua_source(lua_sources "${LUAJIT_JITLIB_DIR}/vmdef.lua")
-+lua_source(lua_sources "${LUAJIT_JITLIB_DIR}/v.lua")
-+lua_source(lua_sources "${LUAJIT_JITLIB_DIR}/p.lua")
-+lua_source(lua_sources "${LUAJIT_JITLIB_DIR}/zone.lua")
- 
- add_custom_target(generate_lua_sources
-     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/box
-
-@@ -197,10 +197,11 @@
- # Rule of thumb: if exporting a symbol from a static library, list the
- # library here.
- set (reexport_libraries server core misc bitset csv
--     ${LUAJIT_LIBRARIES} ${MSGPUCK_LIBRARIES})
-+     ${MSGPUCK_LIBRARIES})
- 
- set (common_libraries
-     ${reexport_libraries}
-+    ${LUAJIT_LIBRARIES}
-     ${LIBEIO_LIBRARIES}
-     ${LIBGOPT_LIBRARIES}
-     ${LIBYAML_LIBRARIES}
---- a/cmake/luajit.cmake
-+++ b/cmake/luajit.cmake
-@@ -38,6 +38,7 @@
-     set (LUAJIT_PREFIX "${LUAJIT_BUNDLED_PREFIX}")
-     set (LUAJIT_INCLUDE "${PROJECT_SOURCE_DIR}/third_party/luajit/src")
-     set (LUAJIT_LIB "${LUAJIT_BUNDLED_LIB}")
-+    set (LUAJIT_JITLIB_DIR "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit")
-     set (ENABLE_BUNDLED_LUAJIT True)
- endmacro()
- 
-@@ -63,10 +64,12 @@
- # usable with the server (determined by a compiled test).
- #
- macro (luajit_try_system)
--    find_path (LUAJIT_INCLUDE lj_obj.h PATH_SUFFIXES luajit-2.0 luajit)
-+    find_path (LUAJIT_INCLUDE lj_obj.h PATH_SUFFIXES luajit-2.1 luajit)
-     find_library (LUAJIT_LIB NAMES luajit luajit-5.1 PATH_SUFFIXES x86_64-linux-gnu)
--    if (LUAJIT_INCLUDE AND LUAJIT_LIB)
--        message (STATUS "include: ${LUAJIT_INCLUDE}, lib: ${LUAJIT_LIB}")
-+    file (GLOB LUAJIT_JITLIB_SEARCH_PATHS "/usr/local/share/luajit-2.1*/jit" "/usr/share/luajit-2.1*/jit" "/share/luajit-2.1*/jit")
-+    find_path (LUAJIT_JITLIB_DIR vmdef.lua PATHS ${LUAJIT_JITLIB_SEARCH_PATHS})
-+    if (LUAJIT_INCLUDE AND LUAJIT_LIB AND LUAJIT_JITLIB_DIR)
-+        message (STATUS "include: ${LUAJIT_INCLUDE}, lib: ${LUAJIT_LIB}, jitlib_dir: ${LUAJIT_JITLIB_DIR}")
-         message (STATUS "Found a system-wide LuaJIT.")
-         luajit_test()
-         if ("${LUAJIT_RUNS}" STREQUAL "1")
-@@ -79,6 +82,7 @@
-         message (FATAL_ERROR "Not found a system LuaJIT")
-         #luajit_use_bundled()
-     endif()
-+    unset(LUAJIT_JITLIB_SEARCH_PATHS)
- endmacro()
- 
- #
-@@ -87,7 +91,8 @@
- macro (luajit_try_prefix)
-     find_path (LUAJIT_INCLUDE "lua.h" ${LUAJIT_PREFIX} NO_DEFAULT_PATH)
-     find_library (LUAJIT_LIB "luajit" ${LUAJIT_PREFIX} NO_DEFAULT_PATH)
--    if (LUAJIT_INCLUDE AND LUAJIT_LIB)
-+    find_path (LUAJIT_JITLIB_DIR "vmdef.lua" ${LUAJIT_PREFIX}/jit NO_DEFAULT_PATH)
-+    if (LUAJIT_INCLUDE AND LUAJIT_LIB AND LUAJIT_JITLIB_DIR)
-         include_directories("${LUAJIT_INCLUDE}")
-         luajit_test()
-         if (LUAJIT_RUNS)
---- a/cmake/utils.cmake
-+++ b/cmake/utils.cmake
-@@ -41,8 +41,8 @@
- function(lua_source varname filename)
-     if (IS_ABSOLUTE "${filename}")
-         set (srcfile "${filename}")
--        set (tmpfile "${filename}.new.c")
--        set (dstfile "${filename}.c")
-+        set (tmpfile "${CMAKE_CURRENT_BINARY_DIR}${filename}.new.c")
-+        set (dstfile "${CMAKE_CURRENT_BINARY_DIR}${filename}.c")
-     else(IS_ABSOLUTE "${filename}")
-         set (srcfile "${CMAKE_CURRENT_SOURCE_DIR}/${filename}")
-         set (tmpfile "${CMAKE_CURRENT_BINARY_DIR}/${filename}.new.c")
-@@ -62,7 +62,7 @@
-         COMMAND ${ECHO} '\;' >> ${tmpfile}
-         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${tmpfile} ${dstfile}
-         COMMAND ${CMAKE_COMMAND} -E remove ${tmpfile}
--        DEPENDS ${srcfile} txt2c libluajit)
-+        DEPENDS ${srcfile} txt2c)
- 
-     set(var ${${varname}})
-     set(${varname} ${var} ${dstfile} PARENT_SCOPE)