# HG changeset patch # User Alex # Date 1521544292 -10800 # Tue Mar 20 14:11:32 2018 +0300 # Node ID 18b40f69c56d4cd1670a775c31091b63b1be9dc4 # Parent b2959a69539dded2623f33aa76209e28a769d3ee # # Fix linker errors # diff -r b2959a69539d -r 18b40f69c56d meson.build --- a/meson.build Sat Mar 17 22:08:20 2018 +0300 +++ b/meson.build Tue Mar 20 14:11:32 2018 +0300 @@ -13,6 +13,7 @@ appindicator = dependency('appindicator3-0.1', version: '>=0.4.92', required: false) gdbm = meson.get_compiler('c').find_library('gdbm') rt = meson.get_compiler('c').find_library('rt') +m = meson.get_compiler('c').find_library('m') po4a = find_program('po4a') diff -r b2959a69539d -r 18b40f69c56d src/Makefile --- a/src/Makefile Sat Mar 17 22:08:20 2018 +0300 +++ b/src/Makefile Tue Mar 20 14:11:32 2018 +0300 @@ -4,10 +4,10 @@ GCC = gcc ifeq ($(ADDLIBSNAMES),) INC = `pkg-config --cflags gtk+-3.0 gthread-2.0 gmodule-2.0` -LIB = `pkg-config --libs gtk+-3.0 gthread-2.0 gmodule-2.0` -lgdbm +LIB = `pkg-config --libs gtk+-3.0 gthread-2.0 gmodule-2.0` -lgdbm -lm else INC = `pkg-config --cflags gtk+-3.0 gthread-2.0 gmodule-2.0 $(ADDLIBSNAMES)` -LIB = `pkg-config --libs gtk+-3.0 gthread-2.0 gmodule-2.0 $(ADDLIBSNAMES)` -lgdbm +LIB = `pkg-config --libs gtk+-3.0 gthread-2.0 gmodule-2.0 $(ADDLIBSNAMES)` -lgdbm -lm endif 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 diff -r b2959a69539d -r 18b40f69c56d src/meson.build --- a/src/meson.build Sat Mar 17 22:08:20 2018 +0300 +++ b/src/meson.build Tue Mar 20 14:11:32 2018 +0300 @@ -43,4 +43,4 @@ c_args: c_args, link_args: link_args, install: true, - dependencies : [glib, gobject, gio, gtk, gdbm, gtkspell, appindicator]) + dependencies : [glib, gobject, gio, gmodule, gtk, gdbm, gtkspell, appindicator, m]) diff -r b2959a69539d -r 18b40f69c56d src/modules/Makefile --- a/src/modules/Makefile Sat Mar 17 22:08:20 2018 +0300 +++ b/src/modules/Makefile Tue Mar 20 14:11:32 2018 +0300 @@ -4,9 +4,9 @@ GCCLMOD = gcc -shared INCMOD = `pkg-config --cflags glib-2.0` `pkg-config --cflags gmodule-2.0` `pkg-config --cflags gio-2.0` LIBMOD = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -LIBMOD1 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm -LIBMOD2 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm -LIBMOD5 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm -lrt +LIBMOD1 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm -lm +LIBMOD2 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm -lm +LIBMOD5 = `pkg-config --libs glib-2.0` `pkg-config --libs gmodule-2.0` `pkg-config --libs gio-2.0` -lgdbm -lrt -lm OBJMOD1 = smsdb.o encoding.o dbus-utils.o mm06.o OBJMOD2 = smsdb.o encoding.o dbus-utils.o mm07.o OBJMOD3 = uuid.o nm09.o diff -r b2959a69539d -r 18b40f69c56d src/modules/meson.build --- a/src/modules/meson.build Sat Mar 17 22:08:20 2018 +0300 +++ b/src/modules/meson.build Tue Mar 20 14:11:32 2018 +0300 @@ -14,7 +14,7 @@ c_args: mm06_c_args, install: true, install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'modem-manager-gui', 'modules'), - dependencies : [glib, gobject, gio, gmodule, gdbm]) + dependencies : [glib, gobject, gio, gmodule, gdbm, m]) mm07_c_sources = [ '../smsdb.c', @@ -32,7 +32,7 @@ c_args: mm07_c_args, install: true, install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'modem-manager-gui', 'modules'), - dependencies : [glib, gobject, gio, gmodule, gdbm]) + dependencies : [glib, gobject, gio, gmodule, gdbm, m]) nm09_c_sources = [ 'uuid.c', @@ -82,7 +82,7 @@ c_args: ofono109_c_args, install: true, install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'modem-manager-gui', 'modules'), - dependencies : [glib, gobject, gio, gmodule, gdbm, rt]) + dependencies : [glib, gobject, gio, gmodule, gdbm, rt, m]) connman112_c_sources = [ 'uuid.c',