This patch fixes the compilation error of bluetooth.h on fido branch regards Ankur
Signed-off-by: Ankur Tyagi <[email protected]> ​Upstream-Status: Backported​ --- .../0001-strict-C-compilation-error-fix.patch | 41 ++++++++++++++++++++++ .../bluez/bluez4_4.101.bbappend | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-strict-C-compilation-error-fix.patch diff --git a/meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-strict-C-compilation-error-fix.patch b/meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-strict-C-compilation-error-fix.patch new file mode 100644 index 0000000..c2cac24 --- /dev/null +++ b/meta-arago-distro/recipes-connectivity/bluez/bluez4/0001-strict-C-compilation-error-fix.patch @@ -0,0 +1,41 @@ +From d7fab1e161c2344875b1b0a2363f1f62efdd6cd4 Mon Sep 17 00:00:00 2001 +From: Ankur Tyagi <[email protected]> +Date: Thu, 14 Jan 2016 18:12:23 +1300 +Subject: [PATCH 1/1] strict C compilation error fix + +Signed-off-by: Ankur Tyagi <[email protected]> +--- + lib/bluetooth.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/bluetooth.h b/lib/bluetooth.h +index 0fc4508..449431d 100644 +--- a/lib/bluetooth.h ++++ b/lib/bluetooth.h +@@ -138,18 +138,18 @@ enum { + + /* Bluetooth unaligned access */ + #define bt_get_unaligned(ptr) \ +-({ \ ++__extension__ ({ \ + struct __attribute__((packed)) { \ +- typeof(*(ptr)) __v; \ +- } *__p = (typeof(__p)) (ptr); \ ++ __typeof__(*(ptr)) __v; \ ++ } *__p = (__typeof__(__p)) (ptr); \ + __p->__v; \ + }) + + #define bt_put_unaligned(val, ptr) \ + do { \ + struct __attribute__((packed)) { \ +- typeof(*(ptr)) __v; \ +- } *__p = (typeof(__p)) (ptr); \ ++ __typeof__(*(ptr)) __v; \ ++ } *__p = (__typeof__(__p)) (ptr); \ + __p->__v = (val); \ + } while(0) + +-- +1.9.1 + diff --git a/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend b/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend index d111425..acda4ee 100644 --- a/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend +++ b/meta-arago-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend @@ -5,6 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://bluez4-fix-synchronization-between-bluetoothd-and-dr.patch \ file://0001-socket-enable-for-bluez-4_98.patch \ file://0001-bluez-enable-source-interface.patch \ + file://0001-strict-C-compilation-error-fix.patch \ " # udev 150-170 provide its on hid2hci tool and udev rules for it. Therefore, # disabling hid2hci from bluez4. --
_______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
