CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

modemmanager: Fix build with clang

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit a9ca41110b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2016-11-21 13:32:48 -08:00 committed by Armin Kuster
parent 9dc61c378a
commit 5829238b2f
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch Normal file
View File

@ -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 &&

8
meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.0.bb → meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb
View File

@ -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}"