libindicator

Merge lp://staging/~laney/libindicator/libm-libadd into lp://staging/libindicator/15.10

libm-libadd
Merge into trunk.15.10

Proposed by Iain Lane on 2015-12-08

Status:

Merged

Approved by:

Lars Karlitski on 2015-12-08

Approved revision:

532

Merged at revision:

532

Proposed branch:

lp://staging/~laney/libindicator/libm-libadd

Merge into:

lp://staging/libindicator/15.10

Diff against target:

26 lines (+3/-2)

2 files modified

configure.ac (+1/-1)
libindicator/Makefile.am (+2/-1)

To merge this branch:

bzr merge lp://staging/~laney/libindicator/libm-libadd

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Lars Karlitski (community)		2015-12-08	Approve on 2015-12-08
PS Jenkins bot (community)	continuous-integration		Approve on 2015-12-08
Sebastien Bacher		2015-12-08	Pending
Review via email: mp+279871@code.staging.launchpad.net

Commit message

Add -lm via LDADD to resolve FTBFS in Xenial

Description of the change

libindicator FTBFS in xenial atm

> libtool: link: gcc -shared -fPIC -DPIC .libs/libindicator_la-gen-indicator-service.xml.o .libs/libindicator_la-indicator-object.o .libs/libindicator_la-indicator-object-enum-types.o .libs/libindicator_la-indicator-desktop-shortcuts.o .libs/libindicator_la-indicator-image-helper.o .libs/libindicator_la-indicator-object-marshal.o .libs/libindicator_la-indicator-service.o .libs/libindicator_la-indicator-service-manager.o -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lpangoft2-1.0 -lpango-1.0 -lfontconfig /usr/lib/s390x-linux-gnu/libfreetype.so -lgmodule-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0-lm -pthread -O2 -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -Wl,-z -Wl,defs -Wl,--as-needed -Wl,--export-dynamic -pthread -pthread -Wl,-soname -Wl,libindicator.so.7 -Wl,-version-script -Wl,.libs/libindicator.ver -o .libs/libindicator.so.7.0.0
> /usr/bin/ld: cannot find -lglib-2.0-lm
> collect2: error: ld returned 1 exit status