diff options
| author |  Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2019-07-15 01:25:45 +0200 |
|---|---|---|
| committer |  Peter Korsgaard <peter@korsgaard.com> | 2020-04-06 23:53:48 +0200 |
| commit | b7b6202c5f16798ff59b5653efeffdaad7ad3142 (patch) | |
| tree | f6fb1c78a4d0376d1fda05285b28a2a886c47692 | |
| parent | a19efcf4edc11dce29258487a117007c5e99b598 (diff) | |
| download | buildroot-b7b6202c5f16798ff59b5653efeffdaad7ad3142.tar.gz buildroot-b7b6202c5f16798ff59b5653efeffdaad7ad3142.tar.bz2 | |
package/bluez5_utils: fix build with kernel >= 5.2
Fixes:
- http://autobuild.buildroot.org/results/1b965c5d9c782d6689041eeeb7be3be4a4854346
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 4666e85cfbd482766d0f685869689749f44aea0c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/bluez5_utils/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/package/bluez5_utils/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch b/package/bluez5_utils/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch new file mode 100644 index 0000000000..7d08c6aa40 --- /dev/null +++ b/package/bluez5_utils/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch @@ -0,0 +1,68 @@ +From f36f71f60b1e68c0f12e615b9b128d089ec3dd19 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Fri, 7 Jun 2019 09:51:33 +0200 +Subject: tools: Fix build after y2038 changes in glibc + +The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name +to fix the build. +[Retrieved from: +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/tools/?id=f36f71f60b1e68c0f12e615b9b128d089ec3dd19] +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + tools/l2test.c | 6 +++++- + tools/rctest.c | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +(limited to 'tools') + +diff --git a/tools/l2test.c b/tools/l2test.c +index e755ac881..e787c2ce2 100644 +--- a/tools/l2test.c ++++ b/tools/l2test.c +@@ -55,6 +55,10 @@ + #define BREDR_DEFAULT_PSM 0x1011 + #define LE_DEFAULT_PSM 0x0080 + ++#ifndef SIOCGSTAMP_OLD ++#define SIOCGSTAMP_OLD SIOCGSTAMP ++#endif ++ + /* Test modes */ + enum { + SEND, +@@ -907,7 +911,7 @@ static void recv_mode(int sk) + if (timestamp) { + struct timeval tv; + +- if (ioctl(sk, SIOCGSTAMP, &tv) < 0) { ++ if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) { + timestamp = 0; + memset(ts, 0, sizeof(ts)); + } else { +diff --git a/tools/rctest.c b/tools/rctest.c +index 94490f462..bc8ed875d 100644 +--- a/tools/rctest.c ++++ b/tools/rctest.c +@@ -50,6 +50,10 @@ + + #include "src/shared/util.h" + ++#ifndef SIOCGSTAMP_OLD ++#define SIOCGSTAMP_OLD SIOCGSTAMP ++#endif ++ + /* Test modes */ + enum { + SEND, +@@ -505,7 +509,7 @@ static void recv_mode(int sk) + if (timestamp) { + struct timeval tv; + +- if (ioctl(sk, SIOCGSTAMP, &tv) < 0) { ++ if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) { + timestamp = 0; + memset(ts, 0, sizeof(ts)); + } else { +-- +cgit 1.2-0.3.lf.el7 + |