From 1703d048c3058fc32ebce4a225612ee4ffece71d Mon Sep 17 00:00:00 2001
From: Henri DF <henridf@gmail.com>
Date: Mon, 2 May 2016 22:02:52 -0700
Subject: [PATCH] Add libyaml (c lib) and lyaml (lua bindings) to build

---
 CMakeLists.txt                 | 21 +++++++++++++++++++++
 userspace/falco/CMakeLists.txt | 11 +++++------
 userspace/falco/lua/.gitignore |  1 +
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 userspace/falco/lua/.gitignore

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31cf9ca2..fb86493f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,6 +152,27 @@ ExternalProject_Add(lpeg
 		    CONFIGURE_COMMAND ""
                     INSTALL_COMMAND "")
 
+
+set (LIBYAML_SRC "${PROJECT_BINARY_DIR}/libyaml-prefix/src/libyaml/src")
+set(LIBYAML_LIB "${LIBYAML_SRC}/.libs/libyaml.a")
+ExternalProject_Add(libyaml
+		    URL "http://download.draios.com/dependencies/libyaml-0.1.4.tar.gz"
+                    URL_MD5 "4a4bced818da0b9ae7fc8ebc690792a7"
+                    BUILD_COMMAND ${CMD_MAKE}
+                    BUILD_IN_SOURCE 1
+		    CONFIGURE_COMMAND ./bootstrap && ./configure
+                    INSTALL_COMMAND "")
+
+set (LYAML_SRC "${PROJECT_BINARY_DIR}/lyaml-prefix/src/lyaml/ext/yaml")
+set(LYAML_LIB "${LYAML_SRC}/.libs/yaml.a")
+ExternalProject_Add(lyaml
+		    URL "http://download.draios.com/dependencies/lyaml-release-v6.0.tar.gz"
+                    URL_MD5 "dc3494689a0dce7cf44e7a99c72b1f30"
+                    BUILD_COMMAND ${CMD_MAKE}
+                    BUILD_IN_SOURCE 1
+		    CONFIGURE_COMMAND ./configure --enable-static LIBS=-L../../../libyaml-prefix/src/libyaml/src/.libs CFLAGS=-I../../../libyaml-prefix/src/libyaml/include CPPFLAGS=-I../../../libyaml-prefix/src/libyaml/include LUA_INCLUDE=-I../../../luajit-prefix/src/luajit/src LUA=../../../luajit-prefix/src/luajit/src/luajit
+                    INSTALL_COMMAND sh -c "cp -R ${PROJECT_BINARY_DIR}/lyaml-prefix/src/lyaml/lib/* ${PROJECT_SOURCE_DIR}/userspace/falco/lua")
+
 install(FILES falco.yaml
 	DESTINATION "${DIR_ETC}")
 
diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt
index 693f4d94..9f361c55 100644
--- a/userspace/falco/CMakeLists.txt
+++ b/userspace/falco/CMakeLists.txt
@@ -13,6 +13,8 @@ add_executable(falco configuration.cpp formats.cpp fields.cpp rules.cpp logger.c
 target_link_libraries(falco sinsp)
 target_link_libraries(falco
 	"${LPEG_SRC}/lpeg.a"
+	"${LYAML_LIB}"
+        "${LIBYAML_LIB}"
 	"${YAMLCPP_LIB}")
 
 
@@ -20,9 +22,6 @@ set(FALCO_LUA_MAIN "rule_loader.lua")
 configure_file(config_falco.h.in config_falco.h)
 
 install(TARGETS falco DESTINATION bin)
-install(FILES lua/compiler.lua
-	DESTINATION share/falco/lua)
-install(FILES lua/rule_loader.lua
-	DESTINATION share/falco/lua)
-install(FILES lua/output.lua
-	DESTINATION share/falco/lua)
+install(DIRECTORY lua
+	DESTINATION share/falco/lua
+	FILES_MATCHING PATTERN *.lua)
diff --git a/userspace/falco/lua/.gitignore b/userspace/falco/lua/.gitignore
new file mode 100644
index 00000000..787bf99c
--- /dev/null
+++ b/userspace/falco/lua/.gitignore
@@ -0,0 +1 @@
+lyaml*