chore: remove jq dependency

Signed-off-by: Roberto Scolaro <[email protected]>
falcosecurity · Nov 22, 2023 · 86b72e5 · 86b72e5
1 parent ec613ef
commit 86b72e5
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 105 deletions.
diff --git a/cmake/modules/jq.cmake b/cmake/modules/jq.cmake
diff --git a/cmake/modules/libsinsp.cmake b/cmake/modules/libsinsp.cmake
@@ -34,7 +34,6 @@ if (NOT EMSCRIPTEN)
 endif()
 if(NOT WIN32 AND NOT APPLE)
 	include(b64)
-	include(jq)
 endif()
 if(NOT WIN32 AND NOT APPLE AND NOT MINIMAL_BUILD AND NOT EMSCRIPTEN)
 	include(cares)
@@ -72,8 +71,6 @@ endif()
 if(NOT WIN32 AND NOT APPLE)
 	get_filename_component(B64_ABSOLUTE_INCLUDE_DIR ${B64_INCLUDE} ABSOLUTE)
 	list(APPEND LIBSINSP_INCLUDE_DIRS ${B64_ABSOLUTE_INCLUDE_DIR})
-	get_filename_component(JQ_ABSOLUTE_INCLUDE_DIR ${JQ_INCLUDE} ABSOLUTE)
-	list(APPEND LIBSINSP_INCLUDE_DIRS ${JQ_ABSOLUTE_INCLUDE_DIR})
 endif()
 
 if(NOT WIN32 AND NOT APPLE AND NOT MINIMAL_BUILD AND NOT EMSCRIPTEN)

diff --git a/test/vm/containers/ubuntu2004.Dockerfile b/test/vm/containers/ubuntu2004.Dockerfile
@@ -34,7 +34,6 @@ RUN apt --fix-broken -y install && apt-get install -y --no-install-recommends \
     libc-ares-dev \
     libprotobuf-dev \
     protobuf-compiler \
-    libjq-dev \
     libgrpc++-dev \
     protobuf-compiler-grpc \
     libcurl4-openssl-dev \

diff --git a/test/vm/containers/ubuntu2204.Dockerfile b/test/vm/containers/ubuntu2204.Dockerfile
@@ -35,7 +35,6 @@ RUN apt --fix-broken -y install && apt-get install -y --no-install-recommends \
     libc-ares-dev \
     libprotobuf-dev \
     protobuf-compiler \
-    libjq-dev \
     libgrpc++-dev \
     protobuf-compiler-grpc \
     libcurl4-openssl-dev \

diff --git a/test/vm/containers/ubuntu2310.Dockerfile b/test/vm/containers/ubuntu2310.Dockerfile
@@ -33,7 +33,6 @@ RUN apt --fix-broken -y install && apt-get install -y \
     libc-ares-dev \
     libprotobuf-dev \
     protobuf-compiler \
-    libjq-dev \
     libgrpc++-dev \
     protobuf-compiler-grpc \
     libcurl4-openssl-dev \

diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
@@ -66,7 +66,6 @@ if(NOT WIN32 AND NOT APPLE )
 		include(protobuf)
 		include(openssl)
 	endif() # NOT MINIMAL_BUILD
-	include(jq)
 	include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 endif()
 
@@ -268,32 +267,25 @@ if(NOT WIN32)
 						"${GPR_LIB}"
 						"${PROTOBUF_LIB}"
 						"${CARES_LIB}"
-						"${JQ_LIB}")
+			)
 			list(APPEND SINSP_PKGCONFIG_LIBRARIES
 						"${GRPC_LIBRARIES}"
 						"${GRPCPP_LIB}"
 						"${GRPC_LIB}"
 						"${GPR_LIB}"
 						"${PROTOBUF_LIB}"
 						"${CARES_LIB}"
-						"${JQ_LIB}")
+			)
 
 			if(NOT MUSL_OPTIMIZED_BUILD)
 				target_link_libraries(sinsp INTERFACE rt anl)
 				list(APPEND SINSP_PKGCONFIG_LIBRARIES rt anl)
 			endif()
 
 		else()
-			target_link_libraries(sinsp INTERFACE "${JQ_LIB}" rt)
-			list(APPEND SINSP_PKGCONFIG_LIBRARIES "${JQ_LIB}" rt)
+			target_link_libraries(sinsp INTERFACE rt)
+			list(APPEND SINSP_PKGCONFIG_LIBRARIES rt)
 		endif() # NOT MINIMAL_BUILD
-		# when JQ is compiled statically, it will
-		# also compile a static object for oniguruma we need to link
-		if(ONIGURUMA_LIB)
-			target_link_libraries(sinsp INTERFACE "${ONIGURUMA_LIB}")
-			list(APPEND SINSP_PKGCONFIG_LIBRARIES "${ONIGURUMA_LIB}")
-			add_dependencies(sinsp jq)
-		endif()
 	endif() # NOT APPLE
 
 	target_link_libraries(sinsp INTERFACE "${OPENSSL_LIBRARIES}")