diff options
Diffstat (limited to 'net-mgmt/netdata/files')
4 files changed, 81 insertions, 15 deletions
diff --git a/net-mgmt/netdata/files/patch-CMakeLists.txt b/net-mgmt/netdata/files/patch-CMakeLists.txt index 91ce09448b20..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-04-16 21:35:14.357149000 -0600 -+++ CMakeLists.txt 2025-04-16 21:35:44.293883000 -0600 -@@ -40,7 +40,7 @@ +--- CMakeLists.txt.orig 2025-08-08 18:59:37 UTC ++++ CMakeLists.txt +@@ -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) -@@ -95,7 +95,7 @@ +@@ -95,7 +95,7 @@ set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") set(OS_WINDOWS False) set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") @@ -18,7 +18,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") set(OS_MACOS True) -@@ -399,7 +399,7 @@ +@@ -410,7 +410,7 @@ include(NetdataBacktrace) include(NetdataJSONC) include(NetdataYAML) include(NetdataBacktrace) @@ -27,7 +27,7 @@ if(ENABLE_LEGACY_EBPF_PROGRAMS) include(NetdataEBPFLegacy) -@@ -424,9 +424,9 @@ +@@ -435,9 +435,9 @@ endif() netdata_bundle_sentry() endif() @@ -40,7 +40,7 @@ # # check include files -@@ -2986,9 +2986,9 @@ +@@ -3171,9 +3171,9 @@ add_executable(netdata "$<$<BOOL:${OS_WINDOWS}>:${NETDATA_RES_FILES}>" ) @@ -53,7 +53,23 @@ if(OS_WINDOWS) add_executable(NetdataClaim ${CLAIM_WINDOWS_FILES} ${NETDATA_CLAIM_RES_FILES}) -@@ -3131,12 +3131,12 @@ +@@ -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() @@ -72,7 +88,7 @@ # A non-default value is only used when building Debian packages (/var/lib/netdata/www) if(NOT DEFINED WEB_DIR) -@@ -3189,11 +3189,12 @@ +@@ -3388,11 +3390,12 @@ install(TARGETS netdata COMPONENT netdata DESTINATION install(TARGETS netdata COMPONENT netdata DESTINATION "${BINDIR}") @@ -90,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) -@@ -3208,11 +3209,11 @@ +@@ -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}") @@ -107,7 +123,7 @@ set(netdata_user_POST "${NETDATA_USER}") set(netdata_group_POST "${NETDATA_USER}") -@@ -3730,8 +3731,8 @@ +@@ -3929,8 +3932,8 @@ if(ENABLE_DASHBOARD) # if(ENABLE_DASHBOARD) diff --git a/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataBacktrace.cmake b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataBacktrace.cmake new file mode 100644 index 000000000000..4daa5ef3790a --- /dev/null +++ b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataBacktrace.cmake @@ -0,0 +1,50 @@ +--- packaging/cmake/Modules/NetdataBacktrace.cmake.orig 2025-05-28 22:57:38 UTC ++++ packaging/cmake/Modules/NetdataBacktrace.cmake +@@ -10,43 +10,23 @@ function(netdata_bundle_libbacktrace) + function(netdata_bundle_libbacktrace) + message(STATUS "Preparing libbacktrace") + +- set(libbacktrace_SOURCE_DIR "${CMAKE_BINARY_DIR}/libbacktrace-src") +- set(libbacktrace_BINARY_DIR "${CMAKE_BINARY_DIR}/libbacktrace-build") +- set(libbacktrace_INSTALL_DIR "${CMAKE_BINARY_DIR}/libbacktrace-install") +- set(libbacktrace_LIBRARY "${libbacktrace_INSTALL_DIR}/lib/libbacktrace.a") ++ set(libbacktrace_LIBRARY "%%LOCALBASE%%/lib/libbacktrace.a") + +- # Clone and build libbacktrace +- ExternalProject_Add( +- libbacktrace +- GIT_REPOSITORY https://github.com/ianlancetaylor/libbacktrace.git +- SOURCE_DIR "${libbacktrace_SOURCE_DIR}" +- BINARY_DIR "${libbacktrace_BINARY_DIR}" +- CONFIGURE_COMMAND "${libbacktrace_SOURCE_DIR}/configure" --prefix=${libbacktrace_INSTALL_DIR} --enable-static +- BUILD_COMMAND make install +- INSTALL_COMMAND "" +- BUILD_BYPRODUCTS "${libbacktrace_LIBRARY}" +- EXCLUDE_FROM_ALL 1 +- UPDATE_DISCONNECTED ON +- ) +- + # Create an imported library target +- add_library(libbacktrace_library STATIC IMPORTED GLOBAL) ++ add_library(libbacktrace STATIC IMPORTED GLOBAL) + set_property( +- TARGET libbacktrace_library ++ TARGET libbacktrace + PROPERTY IMPORTED_LOCATION "${libbacktrace_LIBRARY}" + ) +- add_dependencies(libbacktrace_library libbacktrace) + + # Export variables to parent scope +- set(NETDATA_LIBBACKTRACE_INCLUDE_DIRS "${libbacktrace_INSTALL_DIR}/include" PARENT_SCOPE) +- set(NETDATA_LIBBACKTRACE_LIBRARIES libbacktrace_library PARENT_SCOPE) ++ set(NETDATA_LIBBACKTRACE_LIBRARIES libbacktrace PARENT_SCOPE) + set(HAVE_LIBBACKTRACE TRUE PARENT_SCOPE) + + message(STATUS "Finished preparing libbacktrace") + endfunction() + + function(netdata_add_libbacktrace_to_target _target) +- target_include_directories(${_target} BEFORE PUBLIC "${NETDATA_LIBBACKTRACE_INCLUDE_DIRS}") + target_link_libraries(${_target} PUBLIC ${NETDATA_LIBBACKTRACE_LIBRARIES}) + add_dependencies(${_target} libbacktrace) + endfunction() diff --git a/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataGoTools.cmake b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataGoTools.cmake index a87ba63098ff..d857caec25eb 100644 --- a/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataGoTools.cmake +++ b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataGoTools.cmake @@ -1,6 +1,6 @@ ---- packaging/cmake/Modules/NetdataGoTools.cmake.orig 2025-01-02 17:07:16 UTC +--- packaging/cmake/Modules/NetdataGoTools.cmake.orig 2025-05-28 22:57:38 UTC +++ packaging/cmake/Modules/NetdataGoTools.cmake -@@ -33,7 +33,7 @@ macro(add_go_target target output build_src build_dir) +@@ -30,7 +30,7 @@ macro(add_go_target target output build_src build_dir) add_custom_command( OUTPUT ${output} diff --git a/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataVersion.cmake b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataVersion.cmake index ffb77ef0dc94..8d17a5be7bd2 100644 --- a/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataVersion.cmake +++ b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataVersion.cmake @@ -1,6 +1,6 @@ ---- packaging/cmake/Modules/NetdataVersion.cmake.orig 2025-01-02 17:07:16 UTC +--- packaging/cmake/Modules/NetdataVersion.cmake.orig 2025-05-28 22:57:38 UTC +++ packaging/cmake/Modules/NetdataVersion.cmake -@@ -7,22 +7,23 @@ function(netdata_version) +@@ -5,22 +5,23 @@ function(netdata_version) # packaging/version. This version field are used for cmake's project, # cpack's packaging, and the agent's functionality. function(netdata_version) |