From 3c6eb7faae247d2e149e6db5c4b900d0cefe0bce Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 11 Feb 2021 14:25:37 +0100 Subject: Adding patch from Helmut Grohne to fix FTCBFS by not abusing AC_CHECK_FILE (Closes: #982523). Signed-off-by: Daniel Baumann --- debian/patches/series | 1 + debian/patches/upstream/0002-fix-FTCBFS.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 debian/patches/upstream/0002-fix-FTCBFS.patch diff --git a/debian/patches/series b/debian/patches/series index 55595ed23..0be909bad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ debian/0011-remove-signin.patch debian/0012-remove-googlefonts.patch debian/0013-remove-googletagmanager.patch upstream/0001-allow-symlinks.patch +upstream/0002-fix-FTCBFS.patch diff --git a/debian/patches/upstream/0002-fix-FTCBFS.patch b/debian/patches/upstream/0002-fix-FTCBFS.patch new file mode 100644 index 000000000..10cf18f67 --- /dev/null +++ b/debian/patches/upstream/0002-fix-FTCBFS.patch @@ -0,0 +1,17 @@ +Author: Helmut Grohne +Description: Fixes FTCBFS by not abusing AC_CHECK_FILE (Closes: #982523). + +diff -Naurp netdata.orig/configure.ac netdata/configure.ac +--- netdata.orig/configure.ac ++++ netdata/configure.ac +@@ -1025,8 +1025,8 @@ if test "${build_target}" = "linux" -a " + [#include ] + ) + +- AC_CHECK_FILE( +- externaldeps/libbpf/libbpf.a, ++ AS_IF( ++ [test -e externaldeps/libbpf/libbpf.a], + [have_libbpf=yes], + [have_libbpf=no] + ) -- cgit v1.2.3