From 75c5cc23b43bbe1fd3c7abbd27752afa902e9e4e Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 2 Mar 2020 12:08:26 +0100 Subject: [PATCH] package/mesa3d: fix linux/kcmp.h related compile failure Add upstream patch [1]. Fixes: http://autobuild.buildroot.net/results/df5bcb8e4f6e98c4de347abbbe91e10a98047422 ../src/util/os_file.c:37:24: fatal error: linux/kcmp.h: No such file or directory [1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=f7bfb10c69dfe48a91e35523cb5ee641bdbf6988 Signed-off-by: Peter Seiderer Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- ...util-remove-the-dependency-on-kcmp.h.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch diff --git a/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch b/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch new file mode 100644 index 0000000000..27ae021e08 --- /dev/null +++ b/package/mesa3d/0006-util-remove-the-dependency-on-kcmp.h.patch @@ -0,0 +1,42 @@ +From 63ad4535df6a0a938e7391d73adcada05e730c89 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= +Date: Tue, 18 Feb 2020 16:12:23 -0500 +Subject: [PATCH] util: remove the dependency on kcmp.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: f76cbc7901f7 "util: Add os_same_file_description helper" + +Acked-by: Eric Engestrom +Reviewed-by: Michel Dänzer +Tested-by: Marge Bot +Part-of: + +[ Upstream: https://cgit.freedesktop.org/mesa/mesa/commit/?id=f7bfb10c69dfe48a91e35523cb5ee641bdbf6988 ] +Signed-off-by: Peter Seiderer +--- + src/util/os_file.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/util/os_file.c b/src/util/os_file.c +index b502ff4..128fe87 100644 +--- a/src/util/os_file.c ++++ b/src/util/os_file.c +@@ -34,11 +34,12 @@ os_file_create_unique(const char *filename, int filemode) + #if defined(__linux__) + + #include +-#include + #include + #include + #include + ++/* copied from */ ++#define KCMP_FILE 0 + + static ssize_t + readN(int fd, char *buf, size_t len) +-- +2.25.1 + -- 2.30.2