mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 09:32:14 +02:00
0c1437563b
Drop the patch to install tests as the Meson build allows this. Drop the patch to disable cunit as this predates recipe-specific-sysroots and isn't required anymore. As Meson always builds the test suite (instead of building before running it), add a patch to fix compilation with musl. (From OE-Core rev: 8dcebad54ded4fa9b3455b674be37ad0b10190d8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
36 lines
933 B
Diff
36 lines
933 B
Diff
Upstream-Status: Submitted
|
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
|
|
From 46c0fd6c827a8cb4d04e067bf04fab579ac4712e Mon Sep 17 00:00:00 2001
|
|
From: Ross Burton <ross.burton@intel.com>
|
|
Date: Mon, 18 Jun 2018 15:07:03 +0100
|
|
Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature
|
|
|
|
POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to
|
|
use (int, unsigned long int, ...) instead.
|
|
|
|
Use a #ifdef to adapt the replacement function as appropriate.
|
|
---
|
|
tests/nouveau/threaded.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
|
|
index 3669bcd3..e1c27c01 100644
|
|
--- a/tests/nouveau/threaded.c
|
|
+++ b/tests/nouveau/threaded.c
|
|
@@ -36,7 +36,11 @@ static int failed;
|
|
|
|
static int import_fd;
|
|
|
|
+#ifdef __GLIBC__
|
|
int ioctl(int fd, unsigned long request, ...)
|
|
+#else
|
|
+int ioctl(int fd, int request, ...)
|
|
+#endif
|
|
{
|
|
va_list va;
|
|
int ret;
|
|
--
|
|
2.11.0
|
|
|