Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drop Falco luajit module, use the one provied by libs #1788

Merged
merged 4 commits into from
Nov 17, 2021
Merged

drop Falco luajit module, use the one provied by libs #1788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d12851
update(build): dropped Falco local luajit module, use the one provide…
FedeDP Nov 16, 2021
53ed114
wip: point to my own library for CI purposes.
FedeDP Nov 16, 2021
67d502e
update(build): force using libs-bundled luajit.
FedeDP Nov 17, 2021
14d898c
update(build): update libs to falcosecurity/libs master.
FedeDP Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,12 @@ set(CMD_MAKE make)

include(ExternalProject)

# LuaJIT
include(luajit)

# libs
include(falcosecurity-libs)

# LuaJit provided by libs
include(luajit)

# jq
include(jq)

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/luajit.patch)
PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/libscap.patch)
57 changes: 0 additions & 57 deletions cmake/modules/falcosecurity-libs-repo/patch/luajit.patch
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions cmake/modules/falcosecurity-libs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ file(MAKE_DIRECTORY ${FALCOSECURITY_LIBS_CMAKE_WORKING_DIR})
# default below In case you want to test against another falcosecurity/libs version just pass the variable - ie., `cmake
# -DFALCOSECURITY_LIBS_VERSION=dev ..`
if(NOT FALCOSECURITY_LIBS_VERSION)
set(FALCOSECURITY_LIBS_VERSION "c5a8d93162e0b1803226187a2c1adddd859877f5")
set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=575d569f8b1f9c3a1202a380129e61a3db39569fe6d70a48cfc34962b1d05139")
set(FALCOSECURITY_LIBS_VERSION "4f320f32ef36738a282e0e801bb114a749f8a00c")
set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=2748eb22d298fdf81635f54355842bfd1a166cd1fb97083b685a50680d970607")
endif()

# cd /path/to/build && cmake /path/to/source
Expand Down Expand Up @@ -60,6 +60,7 @@ set(WITH_CHISEL ON CACHE BOOL "")
set(USE_BUNDLED_TBB ON CACHE BOOL "")
set(USE_BUNDLED_B64 ON CACHE BOOL "")
set(USE_BUNDLED_JSONCPP ON CACHE BOOL "")
set(USE_BUNDLED_LUAJIT ON CACHE BOOL "")

list(APPEND CMAKE_MODULE_PATH "${FALCOSECURITY_LIBS_SOURCE_DIR}/cmake/modules")

Expand Down
30 changes: 0 additions & 30 deletions cmake/modules/luajit.cmake
View file
Open in desktop

This file was deleted.