summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-05 16:43:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-09 12:00:42 +0000
commit03a44db3815cc3abdeea7e6cc39fcd1e652ffb6f (patch)
tree9b7b11adfaa93c7b4c561f2618ef40d86b385766 /meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch
parent79223afc724c52abf8d7722e1a6a55d7d42bff19 (diff)
downloadpoky-03a44db3815cc3abdeea7e6cc39fcd1e652ffb6f.tar.gz
bluez: update 5.50 -> 5.52
Drop a big pile of backports. Disable zsh completions, as they're unlikely to be useful. (From OE-Core rev: dad8cd50bcc4203a65d153dc2445502c1e728975) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch68
1 files changed, 0 insertions, 68 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch
deleted file mode 100644
index 9ca20ae53b..0000000000
--- a/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From f36f71f60b1e68c0f12e615b9b128d089ec3dd19 Mon Sep 17 00:00:00 2001
2From: Bastien Nocera <hadess@hadess.net>
3Date: Fri, 7 Jun 2019 09:51:33 +0200
4Subject: [PATCH] tools: Fix build after y2038 changes in glibc
5
6The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name
7to fix the build.
8
9Upstream-Status: backport commit f36f71f60b1e68c0f12e615b9b128d089ec3dd19
10
11Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
12
13---
14 tools/l2test.c | 6 +++++-
15 tools/rctest.c | 6 +++++-
16 2 files changed, 10 insertions(+), 2 deletions(-)
17
18diff --git a/tools/l2test.c b/tools/l2test.c
19index e755ac881..e787c2ce2 100644
20--- a/tools/l2test.c
21+++ b/tools/l2test.c
22@@ -55,6 +55,10 @@
23 #define BREDR_DEFAULT_PSM 0x1011
24 #define LE_DEFAULT_PSM 0x0080
25
26+#ifndef SIOCGSTAMP_OLD
27+#define SIOCGSTAMP_OLD SIOCGSTAMP
28+#endif
29+
30 /* Test modes */
31 enum {
32 SEND,
33@@ -907,7 +911,7 @@ static void recv_mode(int sk)
34 if (timestamp) {
35 struct timeval tv;
36
37- if (ioctl(sk, SIOCGSTAMP, &tv) < 0) {
38+ if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) {
39 timestamp = 0;
40 memset(ts, 0, sizeof(ts));
41 } else {
42diff --git a/tools/rctest.c b/tools/rctest.c
43index 94490f462..bc8ed875d 100644
44--- a/tools/rctest.c
45+++ b/tools/rctest.c
46@@ -50,6 +50,10 @@
47
48 #include "src/shared/util.h"
49
50+#ifndef SIOCGSTAMP_OLD
51+#define SIOCGSTAMP_OLD SIOCGSTAMP
52+#endif
53+
54 /* Test modes */
55 enum {
56 SEND,
57@@ -505,7 +509,7 @@ static void recv_mode(int sk)
58 if (timestamp) {
59 struct timeval tv;
60
61- if (ioctl(sk, SIOCGSTAMP, &tv) < 0) {
62+ if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) {
63 timestamp = 0;
64 memset(ts, 0, sizeof(ts));
65 } else {
66--
672.19.1
68