diff options
Diffstat (limited to 'net-mgmt/netdata/files/patch-CMakeLists.txt')
| -rw-r--r-- | net-mgmt/netdata/files/patch-CMakeLists.txt | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/net-mgmt/netdata/files/patch-CMakeLists.txt b/net-mgmt/netdata/files/patch-CMakeLists.txt index 3ae91ef65820..9b29c5bcc787 100644 --- a/net-mgmt/netdata/files/patch-CMakeLists.txt +++ b/net-mgmt/netdata/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2025-08-08 18:59:37 UTC +--- CMakeLists.txt.orig 2025-10-01 17:58:58 UTC +++ CMakeLists.txt @@ -40,7 +40,7 @@ set(CMAKE_C_STANDARD 11) set(CMAKE_INSTALL_MESSAGE LAZY) @@ -18,7 +18,24 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") set(OS_MACOS True) -@@ -410,7 +410,7 @@ include(NetdataBacktrace) +@@ -230,6 +230,7 @@ if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN + + # Setup Rust/Corrosion for plugins that need it + if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN_OTEL) ++ #[[ + include(FetchContent) + FetchContent_Declare( + Corrosion +@@ -237,6 +238,8 @@ if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN + GIT_TAG f3b91559efca32c6b54837866ef35ba98ff5b2ca # stable/v0.5 + ) + FetchContent_MakeAvailable(Corrosion) ++ ]] ++ find_package(Corrosion REQUIRED) + corrosion_import_crate(MANIFEST_PATH src/crates/jf/Cargo.toml + CRATES journal_reader_ffi otel-plugin) + endif() +@@ -413,7 +416,7 @@ include(NetdataBacktrace) include(NetdataJSONC) include(NetdataYAML) include(NetdataBacktrace) @@ -27,7 +44,7 @@ if(ENABLE_LEGACY_EBPF_PROGRAMS) include(NetdataEBPFLegacy) -@@ -435,9 +435,9 @@ endif() +@@ -438,9 +441,9 @@ endif() netdata_bundle_sentry() endif() @@ -40,7 +57,7 @@ # # check include files -@@ -3171,9 +3171,9 @@ add_executable(netdata +@@ -3031,9 +3034,9 @@ add_executable(netdata "$<$<BOOL:${OS_WINDOWS}>:${NETDATA_RES_FILES}>" ) @@ -53,7 +70,7 @@ if(OS_WINDOWS) add_executable(NetdataClaim ${CLAIM_WINDOWS_FILES} ${NETDATA_CLAIM_RES_FILES}) -@@ -3297,6 +3297,7 @@ if(ENABLE_PLUGIN_GO) +@@ -3156,6 +3159,7 @@ if(ENABLE_PLUGIN_GO) COMPONENT plugin-go DESTINATION libexec/netdata/plugins.d) @@ -61,7 +78,7 @@ # Build and install nd-mcp (stdio-golang bridge) exactly like go.d.plugin if (OS_WINDOWS) set(ND_MCP_NAME nd-mcp.exe) -@@ -3309,6 +3310,7 @@ if(ENABLE_PLUGIN_GO) +@@ -3168,6 +3172,7 @@ if(ENABLE_PLUGIN_GO) ${CMAKE_BINARY_DIR}/${ND_MCP_NAME} COMPONENT plugin-go DESTINATION "${BINDIR}") @@ -69,7 +86,7 @@ endif() # -@@ -3330,12 +3332,12 @@ endif() +@@ -3197,12 +3202,12 @@ endif() string(REGEX REPLACE "/$" "" NETDATA_RUNTIME_PREFIX "${NETDATA_RUNTIME_PREFIX}") endif() @@ -88,7 +105,7 @@ # A non-default value is only used when building Debian packages (/var/lib/netdata/www) if(NOT DEFINED WEB_DIR) -@@ -3388,11 +3390,12 @@ install(TARGETS netdata COMPONENT netdata DESTINATION +@@ -3255,11 +3260,12 @@ install(TARGETS netdata COMPONENT netdata DESTINATION install(TARGETS netdata COMPONENT netdata DESTINATION "${BINDIR}") @@ -106,7 +123,7 @@ install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata) install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/custom-plugins.d) install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/health.d) -@@ -3407,11 +3410,11 @@ set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}" +@@ -3274,11 +3280,11 @@ set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}" set(pkglibexecdir_POST "${NETDATA_RUNTIME_PREFIX}/libexec/netdata") set(localstatedir_POST "${NETDATA_RUNTIME_PREFIX}/var") set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}") @@ -123,7 +140,7 @@ set(netdata_user_POST "${NETDATA_USER}") set(netdata_group_POST "${NETDATA_USER}") -@@ -3929,8 +3932,8 @@ if(ENABLE_DASHBOARD) +@@ -3804,8 +3810,8 @@ if(ENABLE_DASHBOARD) # if(ENABLE_DASHBOARD) |