From b96e17fe5dd13dd3027f012fe82d832dc7fc0618 Mon Sep 17 00:00:00 2001
From: Lorenzo Fontana <lo@linux.com>
Date: Wed, 11 Dec 2019 13:12:55 +0100
Subject: [PATCH] new: fix lyaml dependencies

Signed-off-by: Lorenzo Fontana <lo@linux.com>
---
 CMakeLists.txt                          | 12 +++++++++++-
 userspace/falco/CMakeLists.txt          |  2 +-
 userspace/falco/verify_engine_fields.sh |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e3ee138..3a1d30f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -193,6 +193,13 @@ endif()
 find_package(OpenSSL REQUIRED)
 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
 #
@@ -257,7 +264,7 @@ ExternalProject_Add(lyaml
 	URL_MD5 "dc3494689a0dce7cf44e7a99c72b1f30"
 	BUILD_COMMAND ${CMD_MAKE}
 	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")
 
 
@@ -291,6 +298,9 @@ set(CIVETWEB_DEPENDENCIES "")
 # if(USE_BUNDLED_OPENSSL)
 # 	list(APPEND CIVETWEB_DEPENDENCIES "openssl")
 # endif()
+# TODO(fntlnz): add openssl here
+# pkg-config openssl --cflags --libs
+# >> -lssl -lcrypto 
 ExternalProject_Add(civetweb
 	DEPENDS ${CIVETWEB_DEPENDENCIES}
 	URL "https://s3.amazonaws.com/download.draios.com/dependencies/civetweb-1.11.tar.gz"
diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt
index 914d0fd8..b7d7ca10 100644
--- a/userspace/falco/CMakeLists.txt
+++ b/userspace/falco/CMakeLists.txt
@@ -75,7 +75,7 @@ target_link_libraries(falco
 configure_file(config_falco.h.in config_falco.h)
 
 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}
 	COMMENT "Comparing engine fields checksum in falco_engine.h to actual fields"
 	)
diff --git a/userspace/falco/verify_engine_fields.sh b/userspace/falco/verify_engine_fields.sh
index 343c28a7..fa9d8996 100644
--- a/userspace/falco/verify_engine_fields.sh
+++ b/userspace/falco/verify_engine_fields.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 SOURCE_DIR=$1
-OPENSSL=../../openssl-prefix/src/openssl/target/bin/openssl
+OPENSSL=$2
 
 if ! command -v ${OPENSSL} version > /dev/null 2>&1; then
     echo "No openssl command at ${OPENSSL}"