diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-11-21 13:32:48 -0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-11-26 01:07:21 +0100 |
| commit | a9ca41110b0dccfa897f0851b259fdb6e8763f00 (patch) | |
| tree | 5479d09f92cc2ab3755b569fc5e51fd4cbb3215b | |
| parent | f708267ebdefaf122a791cb7671a01a8735e16ca (diff) | |
| download | meta-openembedded-contrib-a9ca41110b0dccfa897f0851b259fdb6e8763f00.tar.gz | |
modemmanager: Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch | 21 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb (renamed from meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.0.bb) | 8 |
2 files changed, 26 insertions, 3 deletions
diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch b/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch new file mode 100644 index 0000000000..a3fb0f3eb8 --- /dev/null +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch @@ -0,0 +1,21 @@ +Fixes errors found bt Clang + +| ../../ModemManager-1.6.4/src/mm-bearer-qmi.c:774:50: error: implicit conversion from enumeration type 'MMBearerStatus' to different enumeration type 'MMBearerConnectionStatus' [-Werror,-Wenum-conversion] +| MMBearerConnectionStatus bearer_status = mm_base_bearer_get_status (MM_BASE_BEARER (self)); +| ~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| 1 error generated. + + +Index: ModemManager-1.6.4/src/mm-bearer-qmi.c +=================================================================== +--- ModemManager-1.6.4.orig/src/mm-bearer-qmi.c ++++ ModemManager-1.6.4/src/mm-bearer-qmi.c +@@ -771,7 +771,7 @@ packet_service_status_indication_cb (Qmi + &connection_status, + NULL, + NULL)) { +- MMBearerConnectionStatus bearer_status = mm_base_bearer_get_status (MM_BASE_BEARER (self)); ++ MMBearerConnectionStatus bearer_status = (MMBearerConnectionStatus)mm_base_bearer_get_status (MM_BASE_BEARER (self)); + + if (connection_status == QMI_WDS_CONNECTION_STATUS_DISCONNECTED && + bearer_status != MM_BEARER_CONNECTION_STATUS_DISCONNECTED && diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.0.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb index e26c227754..5e4e220821 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.0.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb @@ -11,9 +11,11 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native" -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[md5sum] = "d9d93d2961ee35b4cd8a75a6a8631cb4" -SRC_URI[sha256sum] = "a94f4657a8fa6835e2734fcc6edf20aa8c8d452f62299d7748541021c3eb2445" +SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ + file://enum-conversion.patch \ +" +SRC_URI[md5sum] = "06488186c7dd53f8104183b86f7a1568" +SRC_URI[sha256sum] = "cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668" S = "${WORKDIR}/ModemManager-${PV}" |