|
 |
29e635d |
# HG changeset patch
|
|
|
29e635d |
# User Alex <alex@linuxonly.ru>
|
|
|
29e635d |
# Date 1521544292 -10800
|
|
|
29e635d |
# Tue Mar 20 14:11:32 2018 +0300
|
|
|
29e635d |
# Node ID 18b40f69c56d4cd1670a775c31091b63b1be9dc4
|
|
|
29e635d |
# Parent b2959a69539dded2623f33aa76209e28a769d3ee
|
|
|
29e635d |
#
|
|
|
29e635d |
# Fix linker errors
|
|
|
29e635d |
#
|
|
|
29e635d |
diff -r b2959a69539d -r 18b40f69c56d meson.build
|
|
|
29e635d |
--- a/meson.build Sat Mar 17 22:08:20 2018 +0300
|
|
|
29e635d |
+++ b/meson.build Tue Mar 20 14:11:32 2018 +0300
|
|
|
29e635d |
@@ -13,6 +13,7 @@
|
|
|
29e635d |
appindicator = dependency('appindicator3-0.1', version: '>=0.4.92', required: false)
|
|
|
29e635d |
gdbm = meson.get_compiler('c').find_library('gdbm')
|
|
|
29e635d |
rt = meson.get_compiler('c').find_library('rt')
|
|
|
29e635d |
+m = meson.get_compiler('c').find_library('m')
|
|
|
29e635d |
|
|
|
29e635d |
po4a = find_program('po4a')
|
|
|
29e635d |
|
|
|
29e635d |
diff -r b2959a69539d -r 18b40f69c56d src/Makefile
|
|
|
29e635d |
--- a/src/Makefile Sat Mar 17 22:08:20 2018 +0300
|
|
|
29e635d |
+++ b/src/Makefile Tue Mar 20 14:11:32 2018 +0300
|
|
|
29e635d |
@@ -4,10 +4,10 @@
|
|
|
29e635d |
GCC = gcc
|
|
|
29e635d |
ifeq ($(ADDLIBSNAMES),)
|
|
|
29e635d |
INC = `pkg-config --cflags gtk+-3.0 gthread-2.0 gmodule-2.0`
|
|
|
29e635d |
-LIB = `pkg-config --libs gtk+-3.0 gthread-2.0 gmodule-2.0` -lgdbm
|
|
|
29e635d |
+LIB = `pkg-config --libs gtk+-3.0 gthread-2.0 gmodule-2.0` -lgdbm -lm
|
|
|
29e635d |
else
|
|
|
29e635d |
INC = `pkg-config --cflags gtk+-3.0 gthread-2.0 gmodule-2.0 $(ADDLIBSNAMES)`
|
|
|
29e635d |
-LIB = `pkg-config --libs gtk+-3.0 gthread-2.0 gmodule-2.0 $(ADDLIBSNAMES)` -lgdbm
|
|
|
29e635d |
+LIB = `pkg-config --libs gtk+-3.0 gthread-2.0 gmodule-2.0 $(ADDLIBSNAMES)` -lgdbm -lm
|
|
|
29e635d |
endif
|
|
|
29e635d |
OBJ = settings.o strformat.o libpaths.o dbus-utils.o notifications.o addressbooks.o ayatana.o smsdb.o trafficdb.o providersdb.o modem-settings.o ussdlist.o encoding.o vcard.o netlink.o polkit.o svcmanager.o mmguicore.o contacts-page.o traffic-page.o scan-page.o info-page.o ussd-page.o sms-page.o devices-page.o preferences-window.o welcome-window.o connection-editor-window.o main.o
|
|
|
29e635d |
|
|
|
29e635d |
diff -r b2959a69539d -r 18b40f69c56d src/meson.build
|
|
|
29e635d |
--- a/src/meson.build Sat Mar 17 22:08:20 2018 +0300
|
|
|
29e635d |
+++ b/src/meson.build Tue Mar 20 14:11:32 2018 +0300
|
|
|
29e635d |
@@ -43,4 +43,4 @@
|
|
|
29e635d |
c_args: c_args,
|
|
|
29e635d |
link_args: link_args,
|
|
|
29e635d |
install: true,
|
|
|
29e635d |
- dependencies : [glib, gobject, gio, gtk, gdbm, gtkspell, appindicator])
|
|
|
29e635d |
+ dependencies : [glib, gobject, gio, gmodule, gtk, gdbm, gtkspell, appindicator, m])
|
|
|
29e635d |
diff -r b2959a69539d -r 18b40f69c56d src/modules/Makefile
|
|
|
29e635d |
--- a/src/modules/Makefile Sat Mar 17 22:08:20 2018 +0300
|
|
|
29e635d |
+++ b/src/modules/Makefile Tue Mar 20 14:11:32 2018 +0300
|
|
|
29e635d |
@@ -4,9 +4,9 @@
|
|
|
29e635d |
GCCLMOD = gcc -shared
|
|
|
29e635d |
INCMOD = `pkg-config --cflags glib-2.0` `pkg-config --cflags gmodule-2.0` `pkg-config --cflags gio-2.0`
|
|
|
29e635d |
LIBMOD = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0`
|
|
|
29e635d |
-LIBMOD1 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm
|
|
|
29e635d |
-LIBMOD2 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm
|
|
|
29e635d |
-LIBMOD5 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm -lrt
|
|
|
29e635d |
+LIBMOD1 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm -lm
|
|
|
29e635d |
+LIBMOD2 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm -lm
|
|
|
29e635d |
+LIBMOD5 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm -lrt -lm
|
|
|
29e635d |
OBJMOD1 = smsdb.o encoding.o dbus-utils.o mm06.o
|
|
|
29e635d |
OBJMOD2 = smsdb.o encoding.o dbus-utils.o mm07.o
|
|
|
29e635d |
OBJMOD3 = uuid.o nm09.o
|
|
|
29e635d |
diff -r b2959a69539d -r 18b40f69c56d src/modules/meson.build
|
|
|
29e635d |
--- a/src/modules/meson.build Sat Mar 17 22:08:20 2018 +0300
|
|
|
29e635d |
+++ b/src/modules/meson.build Tue Mar 20 14:11:32 2018 +0300
|
|
|
29e635d |
@@ -14,7 +14,7 @@
|
|
|
29e635d |
c_args: mm06_c_args,
|
|
|
29e635d |
install: true,
|
|
|
29e635d |
install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'modem-manager-gui', 'modules'),
|
|
|
29e635d |
- dependencies : [glib, gobject, gio, gmodule, gdbm])
|
|
|
29e635d |
+ dependencies : [glib, gobject, gio, gmodule, gdbm, m])
|
|
|
29e635d |
|
|
|
29e635d |
mm07_c_sources = [
|
|
|
29e635d |
'../smsdb.c',
|
|
|
29e635d |
@@ -32,7 +32,7 @@
|
|
|
29e635d |
c_args: mm07_c_args,
|
|
|
29e635d |
install: true,
|
|
|
29e635d |
install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'modem-manager-gui', 'modules'),
|
|
|
29e635d |
- dependencies : [glib, gobject, gio, gmodule, gdbm])
|
|
|
29e635d |
+ dependencies : [glib, gobject, gio, gmodule, gdbm, m])
|
|
|
29e635d |
|
|
|
29e635d |
nm09_c_sources = [
|
|
|
29e635d |
'uuid.c',
|
|
|
29e635d |
@@ -82,7 +82,7 @@
|
|
|
29e635d |
c_args: ofono109_c_args,
|
|
|
29e635d |
install: true,
|
|
|
29e635d |
install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'modem-manager-gui', 'modules'),
|
|
|
29e635d |
- dependencies : [glib, gobject, gio, gmodule, gdbm, rt])
|
|
|
29e635d |
+ dependencies : [glib, gobject, gio, gmodule, gdbm, rt, m])
|
|
|
29e635d |
|
|
|
29e635d |
connman112_c_sources = [
|
|
|
29e635d |
'uuid.c',
|