Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages / netdata
Commits: 71bc0117 by Ivan Shapovalov at 2024-07-28T20:55:37+02:00 netdata: unbreak libbpf build - - - - - 3 changed files: - .SRCINFO - + 0001-Fix-libbpf-build-workaround-for-netdata-libbpf-4.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -36,9 +36,11 @@ pkgbase = netdata optdepends = iw: for monitoring Linux as access point backup = etc/netdata/netdata.conf source = netdata-1.46.2.tar.gz::https://github.com/netdata/netdata/releases/download/v1.46.2/netdata-v1.46.2.tar.gz + source = 0001-Fix-libbpf-build-workaround-for-netdata-libbpf-4.patch source = netdata.sysusers source = netdata.tmpfiles sha512sums = d38951df52638ed8a620e7b271e1ad9fb30b7de1a38b0080c36cdccdb6c64928ff63e6c631d0e762b887d16a94e603a8414eabc0b288cb82e839fadfd38accb3 + sha512sums = 87a97db04edc986d0b687e325c0bd9fbc4bc364f3186cb6ef2b8258a77efe56e20585944260280b20c1280d924f015ee0dc21363562f7f60afb468d049b7e315 sha512sums = a910809a823ba58ca7bdaa72e8d68427b48f452c1fbb2343fa182ecb0a091a7640e73af24b8ba2fdd90e00aed8ef53b7fccd25cb8f04ca9b9fa6c8e52223ca66 sha512sums = 9dcf6058d7e2b072ca6797c3e8fcb2cccc1f6670a9e58769922e078c95a9431370dc429cc34d8e642dbab10942221f1f730d570df7c40d651872931c070be832 ===================================== 0001-Fix-libbpf-build-workaround-for-netdata-libbpf-4.patch ===================================== @@ -0,0 +1,31 @@ +From 81a351257b66b2c2e06e6b372b88fa06f60ce128 Mon Sep 17 00:00:00 2001 +From: Ivan Shapovalov <inte...@intelfx.name> +Date: Sun, 28 Jul 2024 20:43:08 +0200 +Subject: [PATCH] Fix libbpf build (workaround for netdata/libbpf#4) + +--- + packaging/cmake/Modules/NetdataLibBPF.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/packaging/cmake/Modules/NetdataLibBPF.cmake b/packaging/cmake/Modules/NetdataLibBPF.cmake +index 17a26a10f..823a45b4a 100644 +--- a/packaging/cmake/Modules/NetdataLibBPF.cmake ++++ b/packaging/cmake/Modules/NetdataLibBPF.cmake +@@ -72,11 +72,11 @@ function(netdata_bundle_libbpf) + GIT_REPOSITORY https://github.com/netdata/libbpf.git + GIT_TAG ${_libbpf_tag} + SOURCE_DIR "${libbpf_SOURCE_DIR}" +- CONFIGURE_COMMAND "" +- BUILD_COMMAND ${MAKE_COMMAND} -C src CC=${CMAKE_C_COMPILER} BUILD_STATIC_ONLY=1 OBJDIR=build/ DESTDIR=../ install ++ CONFIGURE_COMMAND mkdir -pv src/build/ ++ BUILD_COMMAND ${MAKE_COMMAND} -C src CC=${CMAKE_C_COMPILER} BUILD_STATIC_ONLY=1 OBJDIR=build/ all + BUILD_IN_SOURCE 1 + BUILD_BYPRODUCTS "${_libbpf_library}" +- INSTALL_COMMAND "" ++ INSTALL_COMMAND ${MAKE_COMMAND} -C src CC=${CMAKE_C_COMPILER} BUILD_STATIC_ONLY=1 OBJDIR=build/ DESTDIR=../ install + EXCLUDE_FROM_ALL 1 + ) + +-- +2.45.2.5.g411eac4b43 + ===================================== PKGBUILD ===================================== @@ -21,15 +21,20 @@ optdepends=('iproute2: for monitoring Linux QoS' 'nvme-cli: for go.d/nvme module' 'iw: for monitoring Linux as access point') source=("$pkgname-$pkgver.tar.gz::https://github.com/netdata/netdata/releases/download/v$pkgver/netdata-v$pkgver.tar.gz" + '0001-Fix-libbpf-build-workaround-for-netdata-libbpf-4.patch' netdata.sysusers netdata.tmpfiles) sha512sums=('d38951df52638ed8a620e7b271e1ad9fb30b7de1a38b0080c36cdccdb6c64928ff63e6c631d0e762b887d16a94e603a8414eabc0b288cb82e839fadfd38accb3' + '87a97db04edc986d0b687e325c0bd9fbc4bc364f3186cb6ef2b8258a77efe56e20585944260280b20c1280d924f015ee0dc21363562f7f60afb468d049b7e315' 'a910809a823ba58ca7bdaa72e8d68427b48f452c1fbb2343fa182ecb0a091a7640e73af24b8ba2fdd90e00aed8ef53b7fccd25cb8f04ca9b9fa6c8e52223ca66' '9dcf6058d7e2b072ca6797c3e8fcb2cccc1f6670a9e58769922e078c95a9431370dc429cc34d8e642dbab10942221f1f730d570df7c40d651872931c070be832') prepare() { cd $pkgname-v$pkgver + # fix libbpf build + git apply -3 "$srcdir/0001-Fix-libbpf-build-workaround-for-netdata-libbpf-4.patch" + sed -i "s/CMAKE_CXX_STANDARD 14/CMAKE_CXX_STANDARD 17/" CMakeLists.txt sed -i "s|usr/sbin|usr/bin|g" CMakeLists.txt sed -i "s|usr/libexec|usr/lib|g" CMakeLists.txt View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/netdata/-/commit/71bc011760d7196868dc43a02ce941357f5bb81a -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/netdata/-/commit/71bc011760d7196868dc43a02ce941357f5bb81a You're receiving this email because of your account on gitlab.archlinux.org.