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

chore: remove jq dependency #1500

Merged
merged 1 commit into from
Nov 22, 2023
Merged

chore: remove jq dependency #1500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
87 changes: 0 additions & 87 deletions cmake/modules/jq.cmake
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions cmake/modules/libsinsp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion test/vm/containers/ubuntu2004.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion test/vm/containers/ubuntu2204.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion test/vm/containers/ubuntu2310.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
16 changes: 4 additions & 12 deletions userspace/libsinsp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ if(NOT WIN32 AND NOT APPLE )
include(protobuf)
include(openssl)
endif() # NOT MINIMAL_BUILD
include(jq)
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
endif()

Expand Down Expand Up @@ -269,32 +268,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}")
Expand Down