diff options
Diffstat (limited to 'net-mgmt/netdata/files/patch-CMakeLists.txt')
| -rw-r--r-- | net-mgmt/netdata/files/patch-CMakeLists.txt | 87 |
1 files changed, 59 insertions, 28 deletions
diff --git a/net-mgmt/netdata/files/patch-CMakeLists.txt b/net-mgmt/netdata/files/patch-CMakeLists.txt index 5330282bf430..3ae91ef65820 100644 --- a/net-mgmt/netdata/files/patch-CMakeLists.txt +++ b/net-mgmt/netdata/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2025-01-02 17:07:23 UTC +--- CMakeLists.txt.orig 2025-08-08 18:59:37 UTC +++ CMakeLists.txt -@@ -33,7 +33,7 @@ set(CMAKE_C_STANDARD 11) +@@ -40,7 +40,7 @@ set(CMAKE_C_STANDARD 11) set(CMAKE_INSTALL_MESSAGE LAZY) set(CMAKE_C_STANDARD 11) @@ -9,7 +9,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "netdata") option(USE_CXX_11 "Use C++11 instead of C++14 (should only be used on legacy systems that cannot support C++14, may disable some features)" False) -@@ -94,7 +94,7 @@ set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") +@@ -95,7 +95,7 @@ set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") set(OS_WINDOWS False) set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") @@ -18,26 +18,58 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") set(OS_MACOS True) -@@ -1307,7 +1307,6 @@ if(ENABLE_ML) - set(ML_FILES - src/ml/ad_charts.h - src/ml/ad_charts.cc -- src/ml/dlib/dlib/all/source.cpp - src/ml/ml.cc - src/ml/ml_calculated_number.h - src/ml/ml_host.h -@@ -2682,10 +2681,6 @@ endif() - target_compile_options(NetdataClaim PUBLIC -mwindows) +@@ -410,7 +410,7 @@ include(NetdataBacktrace) + include(NetdataJSONC) + include(NetdataYAML) + include(NetdataBacktrace) +-include(NetdataDlib) ++#include(NetdataDlib) + + if(ENABLE_LEGACY_EBPF_PROGRAMS) + include(NetdataEBPFLegacy) +@@ -435,9 +435,9 @@ endif() + netdata_bundle_sentry() endif() --target_compile_definitions(netdata PRIVATE -- "$<$<BOOL:${ENABLE_ML}>:DLIB_NO_GUI_SUPPORT>" --) -- - target_compile_options(netdata PRIVATE - "$<$<BOOL:${ENABLE_EXPORTER_MONGODB}>:${MONGOC_CFLAGS_OTHER}>" - "$<$<BOOL:${ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE}>:${SNAPPY_CFLAGS_OTHER}>" -@@ -2809,13 +2804,14 @@ endif() +-if(ENABLE_ML) +- netdata_bundle_dlib() +-endif() ++#if(ENABLE_ML) ++# netdata_bundle_dlib() ++#endif() + + # + # check include files +@@ -3171,9 +3171,9 @@ add_executable(netdata + "$<$<BOOL:${OS_WINDOWS}>:${NETDATA_RES_FILES}>" + ) + +-if(ENABLE_ML) +- netdata_add_dlib_to_target(netdata) +-endif() ++#if(ENABLE_ML) ++# netdata_add_dlib_to_target(netdata) ++#endif() + + if(OS_WINDOWS) + add_executable(NetdataClaim ${CLAIM_WINDOWS_FILES} ${NETDATA_CLAIM_RES_FILES}) +@@ -3297,6 +3297,7 @@ if(ENABLE_PLUGIN_GO) + COMPONENT plugin-go + DESTINATION libexec/netdata/plugins.d) + ++#[[ + # 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) + ${CMAKE_BINARY_DIR}/${ND_MCP_NAME} + COMPONENT plugin-go + DESTINATION "${BINDIR}") ++]] + endif() + + # +@@ -3330,12 +3332,12 @@ endif() string(REGEX REPLACE "/$" "" NETDATA_RUNTIME_PREFIX "${NETDATA_RUNTIME_PREFIX}") endif() @@ -54,11 +86,9 @@ +set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/libexec/netdata/plugins.d") +set(VARLIB_DIR "%%NETDATA_PERST%%") -+ # A non-default value is only used when building Debian packages (/var/lib/netdata/www) if(NOT DEFINED WEB_DIR) - set(WEB_DIR "share/netdata/web") -@@ -2839,11 +2835,11 @@ install(TARGETS netdata COMPONENT netdata DESTINATION +@@ -3388,11 +3390,12 @@ install(TARGETS netdata COMPONENT netdata DESTINATION install(TARGETS netdata COMPONENT netdata DESTINATION "${BINDIR}") @@ -67,6 +97,7 @@ -install(DIRECTORY COMPONENT netdata DESTINATION var/lib/netdata/registry) -install(DIRECTORY COMPONENT netdata DESTINATION var/lib/netdata/cloud.d) -install(DIRECTORY COMPONENT netdata DESTINATION var/run/netdata) ++ +install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_CACHE%%) +install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_LOG%%) +install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_PERST%%/registery) @@ -75,7 +106,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) -@@ -2858,11 +2854,11 @@ set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}" +@@ -3407,11 +3410,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}") @@ -92,7 +123,7 @@ set(netdata_user_POST "${NETDATA_USER}") set(netdata_group_POST "${NETDATA_USER}") -@@ -3368,8 +3364,8 @@ if(ENABLE_DASHBOARD) +@@ -3929,8 +3932,8 @@ if(ENABLE_DASHBOARD) # if(ENABLE_DASHBOARD) @@ -101,5 +132,5 @@ + #include(NetdataDashboard) + #bundle_dashboard() - include(src/web/gui/v1/dashboard_v1.cmake) - include(src/web/gui/gui.cmake) + install(FILES + COMPONENT dashboard |