shardbridge

Merge lp:~robert-ancell/shardbridge/no-g-thread-init into lp:shardbridge

  1. no-g-thread-init
  2. Merge into trunk
Proposed by Robert Ancell
Status: Needs review
Proposed branch: lp:~robert-ancell/shardbridge/no-g-thread-init
Merge into: lp:shardbridge
Diff against target: 35 lines (+4/-3)
2 files modified
configure.ac (+1/-1)
src/Makefile.am (+3/-2)
To merge this branch: bzr merge lp:~robert-ancell/shardbridge/no-g-thread-init
Reviewer Review Type Date Requested Status
dobey Pending
Review via email: mp+146502@code.launchpad.net

Description of the change

Doesn't compile in Raring:

  CCLD test-shardbridge
test-shardbridge.o: In function `main':
/home/bob/bzr/shardbridge/src/test-shardbridge.c:1225: undefined reference to `g_thread_init'

If you bump the minimum glib requirement to 2.32 this problem goes away. You can support at least precise with this change.

To post a comment you must log in.

Unmerged revisions

8. By Robert Ancell

Fix compile in Raring

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 2011-12-24 02:05:59 +0000
3+++ configure.ac 2013-02-04 19:48:22 +0000
4@@ -29,7 +29,7 @@
5 AC_SUBST([SHARDBRIDGE_API_VERSION])
6 AC_SUBST([SHARDBRIDGE_LIB_VERSION])
7
8-VALA_CHECK_MODULES([SHARDBRIDGE], [glib-2.0 >= 2.30 json-glib-1.0 sqlheavy-0.1 gee-1.0])
9+VALA_CHECK_MODULES([SHARDBRIDGE], [glib-2.0 >= 2.32 json-glib-1.0 sqlheavy-0.1 gee-1.0])
10 AC_SUBST([SHARDBRIDGE_VALAFLAGS])
11 AC_SUBST([SHARDBRIDGE_CFLAGS])
12 AC_SUBST([SHARDBRIDGE_LIBS])
13
14=== modified file 'src/Makefile.am'
15--- src/Makefile.am 2011-12-25 19:45:01 +0000
16+++ src/Makefile.am 2013-02-04 19:48:22 +0000
17@@ -30,7 +30,7 @@
18 --gir $(GIRNAME) \
19 -H shardbridge.h \
20 --library shardbridge-@SHARDBRIDGE_API_VERSION@ \
21- --target-glib 2.24
22+ --target-glib 2.32
23
24 libshardbridge_@SHARDBRIDGE_API_VERSION@_la_LDFLAGS = \
25 --version-info $(SHARDBRIDGE_LIB_VERSION)
26@@ -51,7 +51,8 @@
27 --thread \
28 --vapidir=$(builddir) \
29 $(SHARDBRIDGE_VALAFLAGS) \
30- --pkg shardbridge-@SHARDBRIDGE_API_VERSION@
31+ --pkg shardbridge-@SHARDBRIDGE_API_VERSION@ \
32+ --target-glib 2.32
33
34 test_shardbridge_LDFLAGS = \
35 $(builddir)/libshardbridge-@SHARDBRIDGE_API_VERSION@.la \

Subscribers

People subscribed via source and target branches

to all changes: