libindicator

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

  1. libm-libadd
  2. Merge into trunk.15.10
Proposed by Iain Lane
Status: Merged
Approved by: Lars Karlitski
Approved revision: 532
Merged at revision: 532
Proposed branch: lp:~laney/libindicator/libm-libadd
Merge into: lp: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:~laney/libindicator/libm-libadd
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Sebastien Bacher Pending
Review via email: [email protected]

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

Adding the LIBM flags like this fixes it.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:532
http://jenkins.qa.ubuntu.com/job/libindicator-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libindicator-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libindicator-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/libindicator-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libindicator-ci/57/rebuild

review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

Yes. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-06-28 18:30:33 +0000
3+++ configure.ac 2015-12-08 10:22:54 +0000
4@@ -68,7 +68,7 @@
5 AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
6
7 LT_LIB_M
8-LIBINDICATOR_LIBS+="$LIBM"
9+AC_SUBST(LIBM)
10
11 ##############################
12 # Custom Junk
13
14=== modified file 'libindicator/Makefile.am'
15--- libindicator/Makefile.am 2013-12-19 14:50:54 +0000
16+++ libindicator/Makefile.am 2015-12-08 10:22:54 +0000
17@@ -68,7 +68,8 @@
18 -Wall -Werror -Wno-error=deprecated-declarations
19
20 libindicator_la_LIBADD = \
21- $(LIBINDICATOR_LIBS)
22+ $(LIBINDICATOR_LIBS) \
23+ $(LIBM)
24
25 libindicator_la_LDFLAGS = \
26 $(COVERAGE_LDFLAGS) \

Subscribers

People subscribed via source and target branches