mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-07 03:29:59 +00:00
evtest: Fix build for 32bit arches with 64bit time_t
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+41
@@ -0,0 +1,41 @@
|
|||||||
|
From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sat, 30 Nov 2019 11:58:58 -0800
|
||||||
|
Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
|
||||||
|
|
||||||
|
time element is deprecated on new input_event structure in kernel's
|
||||||
|
input.h [1]
|
||||||
|
|
||||||
|
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
evtest.c | 7 ++++++-
|
||||||
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/evtest.c b/evtest.c
|
||||||
|
index 548c203..93063cd 100644
|
||||||
|
--- a/evtest.c
|
||||||
|
+++ b/evtest.c
|
||||||
|
@@ -61,6 +61,11 @@
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
+#ifndef input_event_sec
|
||||||
|
+#define input_event_sec time.tv_sec
|
||||||
|
+#define input_event_usec time.tv_usec
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#define BITS_PER_LONG (sizeof(long) * 8)
|
||||||
|
#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
|
||||||
|
#define OFF(x) ((x)%BITS_PER_LONG)
|
||||||
|
@@ -1140,7 +1145,7 @@ static int print_events(int fd)
|
||||||
|
type = ev[i].type;
|
||||||
|
code = ev[i].code;
|
||||||
|
|
||||||
|
- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec);
|
||||||
|
+ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_sec);
|
||||||
|
|
||||||
|
if (type == EV_SYN) {
|
||||||
|
if (code == SYN_MT_REPORT)
|
||||||
@@ -8,8 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
|||||||
DEPENDS = "libxml2"
|
DEPENDS = "libxml2"
|
||||||
|
|
||||||
SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69"
|
SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69"
|
||||||
SRC_URI = "git://anongit.freedesktop.org/evtest;protocol=git \
|
SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https \
|
||||||
file://add_missing_limits_h_include.patch"
|
file://add_missing_limits_h_include.patch \
|
||||||
|
file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
|
||||||
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user