From 0f155c3a1f80ec166a956bbfee8be5117c352c52 Mon Sep 17 00:00:00 2001 From: Lorenzo Fontana Date: Tue, 13 Oct 2020 15:44:08 +0200 Subject: [PATCH] build: switch Falco back to luajit moonjit is unmaintaned [0], and lujit recently [1] added support for the aarch64 architecture. [0] https://twitter.com/siddhesh_p/status/1308594269502885889?s=20 [1] https://github.com/LuaJIT/LuaJIT/commit/e9af1abec542e6f9851ff2368e7f196b6382a44c Signed-off-by: Lorenzo Fontana --- CMakeLists.txt | 4 ++-- cmake/modules/sysdig-repo/CMakeLists.txt | 2 +- .../modules/sysdig-repo/patch/{moonjit.patch => luajit.patch} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename cmake/modules/sysdig-repo/patch/{moonjit.patch => luajit.patch} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58e86772..fdb174bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,8 +148,8 @@ set(LUAJIT_INCLUDE "${LUAJIT_SRC}") set(LUAJIT_LIB "${LUAJIT_SRC}/libluajit.a") ExternalProject_Add( luajit - GIT_REPOSITORY "https://github.com/moonjit/moonjit" - GIT_TAG "2.1.2" + GIT_REPOSITORY "https://github.com/LuaJIT/LuaJIT" + GIT_TAG "1d8b747c161db457e032a023ebbff511f5de5ec2" CONFIGURE_COMMAND "" BUILD_COMMAND ${CMD_MAKE} BUILD_IN_SOURCE 1 diff --git a/cmake/modules/sysdig-repo/CMakeLists.txt b/cmake/modules/sysdig-repo/CMakeLists.txt index 100ec477..defce9ef 100644 --- a/cmake/modules/sysdig-repo/CMakeLists.txt +++ b/cmake/modules/sysdig-repo/CMakeLists.txt @@ -25,4 +25,4 @@ ExternalProject_Add( BUILD_COMMAND "" INSTALL_COMMAND "" TEST_COMMAND "" - PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/libscap.patch && patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/moonjit.patch) + PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/libscap.patch && patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/luajit.patch) diff --git a/cmake/modules/sysdig-repo/patch/moonjit.patch b/cmake/modules/sysdig-repo/patch/luajit.patch similarity index 100% rename from cmake/modules/sysdig-repo/patch/moonjit.patch rename to cmake/modules/sysdig-repo/patch/luajit.patch