diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-09-02 13:13:05 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-09-06 09:22:40 +0000 |
commit | dc2dedef9961950b88f4245ba7499538ec4244ab (patch) | |
tree | 6d0cf28e5db26356cd3e4281f68359615642bf8d | |
parent | b4f9f22effea18f6ada4ea15299021c6f52caff2 (diff) | |
download | meta-qt5-dc2dedef9961950b88f4245ba7499538ec4244ab.tar.gz |
qtserialbus: Fix build with 5.2+ kernel headers
Backport relevant patch from upstream
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch | 33 | ||||
-rw-r--r-- | recipes-qt/qt5/qtserialbus_git.bb | 2 |
2 files changed, 35 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch b/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch new file mode 100644 index 00000000..c42af774 --- /dev/null +++ b/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From b835affb7851f9b8bc2554f0a38e4b539505a132 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre Hartmann <aha_1980@gmx.de> | ||
3 | Date: Mon, 8 Jul 2019 21:35:12 +0200 | ||
4 | Subject: [PATCH] =?UTF-8?q?SocketCAN:=20Fix=20compiler=20error=20"?= | ||
5 | =?UTF-8?q?=E2=80=98SIOCGSTAMP=E2=80=99=20was=20not=20declared"?= | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | Fixes: QTBUG-76957 | ||
11 | Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b | ||
12 | Reviewed-by: Alex Blasche <alexander.blasche@qt.io> | ||
13 | Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> | ||
14 | --- | ||
15 | Upstream-Status: Backport [https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482] | ||
16 | src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 + | ||
17 | 1 file changed, 1 insertion(+) | ||
18 | |||
19 | diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp | ||
20 | index 74b0d1d..a2da146 100644 | ||
21 | --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp | ||
22 | +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp | ||
23 | @@ -45,6 +45,7 @@ | ||
24 | |||
25 | #include <linux/can/error.h> | ||
26 | #include <linux/can/raw.h> | ||
27 | +#include <linux/sockios.h> | ||
28 | #include <errno.h> | ||
29 | #include <unistd.h> | ||
30 | #include <net/if.h> | ||
31 | -- | ||
32 | 2.23.0 | ||
33 | |||
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 4b912be4..d1b294a1 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,6 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRC_URI += "file://0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch" | ||
15 | |||
14 | SRCREV = "64199169df6bd5b1e31d934c0a64c13d57d0f5c4" | 16 | SRCREV = "64199169df6bd5b1e31d934c0a64c13d57d0f5c4" |