diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-07-31 20:59:18 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2019-07-31 20:59:18 +0300 |
| commit | b4f66bacb1b8e661d794fa7a189e2f66f5092e2e (patch) | |
| tree | 5a8302cd349fdb68dadca003483c61917d4a6add /meta-openembedded/meta-oe/recipes-core/libnfc | |
| parent | 43a183cc0926da36e3a218efa02ab4838ace316f (diff) | |
| parent | dd755025e33af27b059ea7ef3afbe850e4880b08 (diff) | |
| download | openbmc-b4f66bacb1b8e661d794fa7a189e2f66f5092e2e.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/libnfc')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch | 24 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb | 5 |
2 files changed, 28 insertions, 1 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch new file mode 100644 index 000000000..b8ed87aa0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch @@ -0,0 +1,24 @@ +From cb2a3991545ba9e885704226ed3e831bd5e4cb27 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 May 2019 22:10:05 -0700 +Subject: [PATCH] usbbus: Include stdint.h for uintX_t + +stdint.h is needed for uintX_t typedefs which are +used to replace u_intX_t in libusb API headers in the cmake files + +Upstream-Status: Submitted [https://github.com/nfc-tools/libnfc/pull/544] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libnfc/buses/usbbus.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/libnfc/buses/usbbus.h ++++ b/libnfc/buses/usbbus.h +@@ -35,6 +35,7 @@ + + #ifndef _WIN32 + // Under POSIX system, we use libusb (>= 0.1.12) ++#include <stdint.h> + #include <usb.h> + #define USB_TIMEDOUT ETIMEDOUT + #define _usb_strerror( X ) strerror(-X) diff --git a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb index d00733bf5..7efd3443d 100644 --- a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb @@ -9,6 +9,9 @@ inherit autotools pkgconfig S = "${WORKDIR}/git" SRCREV = "c42e2502d4627d3ea62f83c32677b100bb3cebdc" -SRC_URI = "git://github.com/nfc-tools/libnfc.git" +SRC_URI = "git://github.com/nfc-tools/libnfc.git \ + file://0001-usbbus-Include-stdint.h-for-uintX_t.patch \ + " +CFLAGS_append_libc-musl = " -D_GNU_SOURCE" DEPENDS = "libusb" |