mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-08 15:14:49 +02:00
qtserialbus: Fix build with 5.2+ kernel headers
Backport relevant patch from upstream Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
From b835affb7851f9b8bc2554f0a38e4b539505a132 Mon Sep 17 00:00:00 2001
|
||||
From: Andre Hartmann <aha_1980@gmx.de>
|
||||
Date: Mon, 8 Jul 2019 21:35:12 +0200
|
||||
Subject: [PATCH] =?UTF-8?q?SocketCAN:=20Fix=20compiler=20error=20"?=
|
||||
=?UTF-8?q?=E2=80=98SIOCGSTAMP=E2=80=99=20was=20not=20declared"?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes: QTBUG-76957
|
||||
Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b
|
||||
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
||||
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
||||
---
|
||||
Upstream-Status: Backport [https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482]
|
||||
src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
|
||||
index 74b0d1d..a2da146 100644
|
||||
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
|
||||
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
|
||||
@@ -45,6 +45,7 @@
|
||||
|
||||
#include <linux/can/error.h>
|
||||
#include <linux/can/raw.h>
|
||||
+#include <linux/sockios.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <net/if.h>
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -11,4 +11,6 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtserialport"
|
||||
|
||||
SRC_URI += "file://0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch"
|
||||
|
||||
SRCREV = "64199169df6bd5b1e31d934c0a64c13d57d0f5c4"
|
||||
|
||||
Reference in New Issue
Block a user