Attachment 127234 Details for Bug 98207 – Suggested patch

[patch] Suggested patch

0001-build-include-telit-helpers-in-TELIT_COMMON_LIBADD_F.patch (text/plain), 3.39 KB, created by Aleksander Morgado on 2016-10-12 09:14:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleksander Morgado

Created: 2016-10-12 09:14:46 UTC

Size: 3.39 KB

patch

obsolete

>From 6976417d001b1c57cf3eda8bebf9028492288727 Mon Sep 17 00:00:00 2001
>From: Aleksander Morgado <aleksander@aleksander.es>
>Date: Wed, 12 Oct 2016 11:10:56 +0200
>Subject: [PATCH] build: include telit helpers in TELIT_COMMON_LIBADD_FLAGS
>
>The dell plugin needs them.
>
>  ModemManager[727]: <warn>  [1476194360.614829] [mm-plugin-manager.c:1494] load_plugin():
>    [plugin manager] could not load plugin '/usr/lib64/ModemManager/libmm-plugin-dell.so':
>    /usr/lib64/ModemManager/libmm-plugin-dell.so: undefined symbol: mm_telit_get_band_flag
>
>https://bugs.freedesktop.org/show_bug.cgi?id=98207
>
>Reported-by: Lubomir Rintel <lkundrak@v3.sk>
>---
> plugins/Makefile.am | 46 +++++++++++++++++++++++++---------------------
> 1 file changed, 25 insertions(+), 21 deletions(-)
>
>diff --git a/plugins/Makefile.am b/plugins/Makefile.am
>index afd3fa9..56e9255 100644
>--- a/plugins/Makefile.am
>+++ b/plugins/Makefile.am
>@@ -222,6 +222,26 @@ NOVATEL_COMMON_LIBADD_FLAGS   = $(builddir)/libmm-utils-novatel.la
> # common telit support
> ################################################################################
> 
>+# Common telit helpers library
>+noinst_LTLIBRARIES += libhelpers-telit.la
>+libhelpers_telit_la_SOURCES = \
>+	telit/mm-modem-helpers-telit.c \
>+	telit/mm-modem-helpers-telit.h \
>+	$(NULL)
>+
>+noinst_PROGRAMS += test-modem-helpers-telit
>+test_modem_helpers_telit_SOURCES = \
>+	telit/tests/test-mm-modem-helpers-telit.c \
>+	$(NULL)
>+test_modem_helpers_telit_CPPFLAGS = \
>+	-I$(top_srcdir)/plugins/telit \
>+	$(NULL)
>+test_modem_helpers_telit_LDADD = \
>+	$(builddir)/libhelpers-telit.la \
>+	$(top_builddir)/src/libhelpers.la \
>+	$(top_builddir)/libmm-glib/libmm-glib.la \
>+	$(NULL)
>+
> # Common telit modem support library
> noinst_LTLIBRARIES += libmm-utils-telit.la
> libmm_utils_telit_la_SOURCES = \
>@@ -232,7 +252,10 @@ libmm_utils_telit_la_SOURCES = \
> 	$(NULL)
> 
> TELIT_COMMON_COMPILER_FLAGS = -I$(top_srcdir)/plugins/telit
>-TELIT_COMMON_LIBADD_FLAGS   = $(builddir)/libmm-utils-telit.la
>+TELIT_COMMON_LIBADD_FLAGS   = \
>+	$(builddir)/libhelpers-telit.la \
>+	$(builddir)/libmm-utils-telit.la \
>+	$(NULL)
> 
> ################################################################################
> # plugin: generic
>@@ -767,25 +790,6 @@ libmm_plugin_via_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
> # plugin: telit
> ################################################################################
> 
>-noinst_LTLIBRARIES += libhelpers-telit.la
>-libhelpers_telit_la_SOURCES = \
>-	telit/mm-modem-helpers-telit.c \
>-	telit/mm-modem-helpers-telit.h \
>-	$(NULL)
>-
>-noinst_PROGRAMS += test-modem-helpers-telit
>-test_modem_helpers_telit_SOURCES = \
>-	telit/tests/test-mm-modem-helpers-telit.c \
>-	$(NULL)
>-test_modem_helpers_telit_CPPFLAGS = \
>-	-I$(top_srcdir)/plugins/telit \
>-	$(NULL)
>-test_modem_helpers_telit_LDADD = \
>-	$(builddir)/libhelpers-telit.la \
>-	$(top_builddir)/src/libhelpers.la \
>-	$(top_builddir)/libmm-glib/libmm-glib.la \
>-	$(NULL)
>-
> pkglib_LTLIBRARIES += libmm-plugin-telit.la
> libmm_plugin_telit_la_SOURCES = \
> 	telit/mm-plugin-telit.c \
>@@ -793,7 +797,7 @@ libmm_plugin_telit_la_SOURCES = \
> 	$(NULL)
> libmm_plugin_telit_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
> libmm_plugin_telit_la_LDFLAGS  = $(PLUGIN_COMMON_LINKER_FLAGS)
>-libmm_plugin_telit_la_LIBADD   = $(builddir)/libhelpers-telit.la $(TELIT_COMMON_LIBADD_FLAGS)
>+libmm_plugin_telit_la_LIBADD   = $(TELIT_COMMON_LIBADD_FLAGS)
> 
> dist_udevrules_DATA += telit/77-mm-telit-port-types.rules
> 
>-- 
>2.10.0
>

Actions: View | Splinter Review

Attachments on bug 98207: 127215 | 127234

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.