github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-08-25 09:28:55 +00:00
Code Issues Projects Releases Wiki Activity

new: fix lyaml dependencies

Browse Source 
Signed-off-by: Lorenzo Fontana <lo@linux.com>
This commit is contained in:
Lorenzo Fontana 2019-12-11 13:12:55 +01:00 committed by Leo Di Donato
parent abdd099c0a
commit b96e17fe5d
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -193,6 +193,13 @@ endif()
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
message(STATUS "Found OpenSSL: include: ${OPENSSL_INCLUDE_DIR}, lib: ${OPENSSL_LIBRARIES}") message(STATUS "Found OpenSSL: include: ${OPENSSL_INCLUDE_DIR}, lib: ${OPENSSL_LIBRARIES}")
find_program (OPENSSL_BINARY openssl)
if(NOT OPENSSL_BINARY)
message(FATAL_ERROR "Couldn't find the openssl command line in PATH")
else()
message(STATUS "Found openssl binary: ${OPENSSL_BINARY}")
endif()
# #
# libcurl # libcurl
# #
@ -257,7 +264,7 @@ ExternalProject_Add(lyaml
URL_MD5 "dc3494689a0dce7cf44e7a99c72b1f30" URL_MD5 "dc3494689a0dce7cf44e7a99c72b1f30"
BUILD_COMMAND ${CMD_MAKE} BUILD_COMMAND ${CMD_MAKE}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ./configure --enable-static LIBS=-L${LIBYAML_SRC}/.libs CFLAGS=-I${LIBYAML_INCLUDE} CPPFLAGS=-I${LIBYAML_INCLUDE} LUA_INCLUDE=-I${LUAJIT_INCLUDE} LUA=${LUAJIT_SRC}/luajit CONFIGURE_COMMAND ./configure --enable-static LIBS=-lyaml LUA_INCLUDE=-I${LUAJIT_INCLUDE} LUA=${LUAJIT_SRC}/luajit
INSTALL_COMMAND sh -c "cp -R ${PROJECT_BINARY_DIR}/lyaml-prefix/src/lyaml/lib/* ${PROJECT_SOURCE_DIR}/userspace/engine/lua") INSTALL_COMMAND sh -c "cp -R ${PROJECT_BINARY_DIR}/lyaml-prefix/src/lyaml/lib/* ${PROJECT_SOURCE_DIR}/userspace/engine/lua")
@ -291,6 +298,9 @@ set(CIVETWEB_DEPENDENCIES "")
# if(USE_BUNDLED_OPENSSL) # if(USE_BUNDLED_OPENSSL)
# list(APPEND CIVETWEB_DEPENDENCIES "openssl") # list(APPEND CIVETWEB_DEPENDENCIES "openssl")
# endif() # endif()
# TODO(fntlnz): add openssl here
# pkg-config openssl --cflags --libs
# >> -lssl -lcrypto
ExternalProject_Add(civetweb ExternalProject_Add(civetweb
DEPENDS ${CIVETWEB_DEPENDENCIES} DEPENDS ${CIVETWEB_DEPENDENCIES}
URL "https://s3.amazonaws.com/download.draios.com/dependencies/civetweb-1.11.tar.gz" URL "https://s3.amazonaws.com/download.draios.com/dependencies/civetweb-1.11.tar.gz"

2
userspace/falco/CMakeLists.txt
View File

@ -75,7 +75,7 @@ target_link_libraries(falco
configure_file(config_falco.h.in config_falco.h) configure_file(config_falco.h.in config_falco.h)
add_custom_command(TARGET falco add_custom_command(TARGET falco
COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/verify_engine_fields.sh ${CMAKE_SOURCE_DIR} COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/verify_engine_fields.sh ${CMAKE_SOURCE_DIR} ${OPENSSL_BINARY}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Comparing engine fields checksum in falco_engine.h to actual fields" COMMENT "Comparing engine fields checksum in falco_engine.h to actual fields"
) )

2
userspace/falco/verify_engine_fields.sh
View File

@ -3,7 +3,7 @@
set -euo pipefail set -euo pipefail
SOURCE_DIR=$1 SOURCE_DIR=$1
OPENSSL=../../openssl-prefix/src/openssl/target/bin/openssl OPENSSL=$2
if ! command -v ${OPENSSL} version > /dev/null 2>&1; then if ! command -v ${OPENSSL} version > /dev/null 2>&1; then
echo "No openssl command at ${OPENSSL}" echo "No openssl command at ${OPENSSL}"