diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-02-26 18:27:40 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-02-26 18:27:49 +0100 |
| commit | 95aeeeea6bda43fac63918482c335fc46e56d0e6 (patch) | |
| tree | c9d3559536a08bea357e98d5061217f7a4a461d3 /patches | |
| parent | afa16c8e04ad07e98a8873275f5b850fd5128f8b (diff) | |
| download | ptxdist-95aeeeea6bda43fac63918482c335fc46e56d0e6.tar.gz ptxdist-95aeeeea6bda43fac63918482c335fc46e56d0e6.tar.xz | |
mesalib: add upstream patch to fix building with old kernel headers
This fixes building host-mesalib on CentOS 7.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/mesa-20.0.0/0001-util-remove-the-dependency-on-kcmp.h.patch | 35 | ||||
| -rw-r--r-- | patches/mesa-20.0.0/series | 4 |
2 files changed, 39 insertions, 0 deletions
diff --git a/patches/mesa-20.0.0/0001-util-remove-the-dependency-on-kcmp.h.patch b/patches/mesa-20.0.0/0001-util-remove-the-dependency-on-kcmp.h.patch new file mode 100644 index 000000000..a82f775e0 --- /dev/null +++ b/patches/mesa-20.0.0/0001-util-remove-the-dependency-on-kcmp.h.patch @@ -0,0 +1,35 @@ +From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com> +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 <eric@engestrom.ch> +Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> +Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3860> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3860> +--- + 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 b502ff4b0ef8..128fe872db1f 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 <fcntl.h> +-#include <linux/kcmp.h> + #include <sys/stat.h> + #include <sys/syscall.h> + #include <unistd.h> + ++/* copied from <linux/kcmp.h> */ ++#define KCMP_FILE 0 + + static ssize_t + readN(int fd, char *buf, size_t len) diff --git a/patches/mesa-20.0.0/series b/patches/mesa-20.0.0/series new file mode 100644 index 000000000..7dc65e58b --- /dev/null +++ b/patches/mesa-20.0.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-util-remove-the-dependency-on-kcmp.h.patch +# 9bb1192b642c5f676918f9eb3bd298c7 - git-ptx-patches magic |