diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-05-20 22:17:42 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-21 08:48:56 -0700 |
commit | 75c7d0058a66a60a58f1acc8e6d08556621c602c (patch) | |
tree | 40f55b4b706715737397479ac0217991ea51ff95 | |
parent | ec45dce920ed8ac478234e97c3e164be481d9365 (diff) | |
download | meta-openembedded-75c7d0058a66a60a58f1acc8e6d08556621c602c.tar.gz |
libnfc: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch | 24 | ||||
-rw-r--r-- | meta-oe/recipes-core/libnfc/libnfc_git.bb | 5 |
2 files changed, 28 insertions, 1 deletions
diff --git a/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch b/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch new file mode 100644 index 0000000000..b8ed87aa0f --- /dev/null +++ b/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From cb2a3991545ba9e885704226ed3e831bd5e4cb27 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 20 May 2019 22:10:05 -0700 | ||
4 | Subject: [PATCH] usbbus: Include stdint.h for uintX_t | ||
5 | |||
6 | stdint.h is needed for uintX_t typedefs which are | ||
7 | used to replace u_intX_t in libusb API headers in the cmake files | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/nfc-tools/libnfc/pull/544] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | libnfc/buses/usbbus.h | 2 ++ | ||
13 | 1 file changed, 2 insertions(+) | ||
14 | |||
15 | --- a/libnfc/buses/usbbus.h | ||
16 | +++ b/libnfc/buses/usbbus.h | ||
17 | @@ -35,6 +35,7 @@ | ||
18 | |||
19 | #ifndef _WIN32 | ||
20 | // Under POSIX system, we use libusb (>= 0.1.12) | ||
21 | +#include <stdint.h> | ||
22 | #include <usb.h> | ||
23 | #define USB_TIMEDOUT ETIMEDOUT | ||
24 | #define _usb_strerror( X ) strerror(-X) | ||
diff --git a/meta-oe/recipes-core/libnfc/libnfc_git.bb b/meta-oe/recipes-core/libnfc/libnfc_git.bb index d00733bf58..7efd3443dd 100644 --- a/meta-oe/recipes-core/libnfc/libnfc_git.bb +++ b/meta-oe/recipes-core/libnfc/libnfc_git.bb | |||
@@ -9,6 +9,9 @@ inherit autotools pkgconfig | |||
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | SRCREV = "c42e2502d4627d3ea62f83c32677b100bb3cebdc" | 11 | SRCREV = "c42e2502d4627d3ea62f83c32677b100bb3cebdc" |
12 | SRC_URI = "git://github.com/nfc-tools/libnfc.git" | 12 | SRC_URI = "git://github.com/nfc-tools/libnfc.git \ |
13 | file://0001-usbbus-Include-stdint.h-for-uintX_t.patch \ | ||
14 | " | ||
13 | 15 | ||
16 | CFLAGS_append_libc-musl = " -D_GNU_SOURCE" | ||
14 | DEPENDS = "libusb" | 17 | DEPENDS = "libusb" |