diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-02-11 13:25:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-02-11 13:25:37 +0000 |
| commit | 3c6eb7faae247d2e149e6db5c4b900d0cefe0bce (patch) | |
| tree | dfd1c7e553e714f0fd29eff1f864da6c5f4a0f58 | |
| parent | Releasing debian version 1.29.1-2. (diff) | |
| download | netdata-3c6eb7faae247d2e149e6db5c4b900d0cefe0bce.tar.xz netdata-3c6eb7faae247d2e149e6db5c4b900d0cefe0bce.zip | |
Adding patch from Helmut Grohne <helmut@subdivi.de> to fix FTCBFS by not abusing AC_CHECK_FILE (Closes: #982523).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/upstream/0002-fix-FTCBFS.patch | 17 |
2 files changed, 18 insertions, 0 deletions
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 <helmut@subdivi.de> +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 <linux/bpf.h>] + ) + +- AC_CHECK_FILE( +- externaldeps/libbpf/libbpf.a, ++ AS_IF( ++ [test -e externaldeps/libbpf/libbpf.a], + [have_libbpf=yes], + [have_libbpf=no] + ) |