Merge lp:~scarneiro/ubuntu/oneiric/opendrim-lmp-ssh/fix-for-756110 into lp:ubuntu/oneiric/opendrim-lmp-ssh

Proposed by Sebastian Carneiro
Status: Merged
Merged at revision: 3
Proposed branch: lp:~scarneiro/ubuntu/oneiric/opendrim-lmp-ssh/fix-for-756110
Merge into: lp:ubuntu/oneiric/opendrim-lmp-ssh
Diff against target: 47 lines (+29/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/01-ftbfs-add-opendrim-lib.patch (+20/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~scarneiro/ubuntu/oneiric/opendrim-lmp-ssh/fix-for-756110
Reviewer Review Type Date Requested Status
Didier Roche Approve
Ubuntu branches Pending
Review via email: mp+67112@code.launchpad.net

Description of the change

Added patch to file acinclude.m4. It adds the opendrim to LIBS variable of check routine, fixing FTBFS when linking with --as-needed flag.

To post a comment you must log in.
Revision history for this message
Sebastian Carneiro (scarneiro) wrote :
Revision history for this message
Didier Roche (didrocks) wrote :

nice catch on that one as well. Thanks :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-07-07 11:04:10 +0000
3+++ debian/changelog 2011-07-07 03:24:29 +0000
4@@ -1,3 +1,11 @@
5+opendrim-lmp-ssh (1.0.0-0ubuntu2) oneiric; urgency=low
6+
7+ * debian/patches/01-ftbfs-add-opendrim-lib.patch: Added library opendrim to
8+ LIBS variable in check routine of acinclude.m4 to build with ld
9+ --as-needed (LP: #756110)
10+
11+ -- Sebastian Carneiro <scarneiro@fibertel.com.ar> Thu, 07 Jul 2011 00:14:33 -0300
12+
13 opendrim-lmp-ssh (1.0.0-0ubuntu1) maverick; urgency=low
14
15 * Initial release
16
17=== added directory 'debian/patches'
18=== added file 'debian/patches/01-ftbfs-add-opendrim-lib.patch'
19--- debian/patches/01-ftbfs-add-opendrim-lib.patch 1970-01-01 00:00:00 +0000
20+++ debian/patches/01-ftbfs-add-opendrim-lib.patch 2011-07-07 03:24:29 +0000
21@@ -0,0 +1,20 @@
22+Description: To fix FTBFS because of changes in defaults for toolchain (binutils)
23+ it is necessary to include library opendrim at linking time. This patch modifies
24+ acinclude.m4 adding such library to the LIBS variable.
25+ .
26+Forwarded: http://sourceforge.net/apps/trac/opendrim/ticket/1
27+Author: Sebastian Carneiro <scarneiro@fibertel.com.ar>
28+Last-Update: 2011-07-06
29+
30+Index: opendrim-lmp-ssh/acinclude.m4
31+===================================================================
32+--- opendrim-lmp-ssh.orig/acinclude.m4 2011-07-07 00:12:31.567179001 -0300
33++++ opendrim-lmp-ssh/acinclude.m4 2011-07-07 00:13:17.057222114 -0300
34+@@ -261,6 +261,7 @@
35+ if test -e $OPENDRIMCOMMONLIBDIR/libopendrim.so
36+ then
37+ AC_MSG_RESULT(yes)
38++ LIBS="${LIBS} -lopendrim"
39+ else
40+ AC_MSG_ERROR([[no. The OpenDRIM Common library could not be found (libopendrim.so)]])
41+ fi
42
43=== added file 'debian/patches/series'
44--- debian/patches/series 1970-01-01 00:00:00 +0000
45+++ debian/patches/series 2011-07-07 03:24:29 +0000
46@@ -0,0 +1,1 @@
47+01-ftbfs-add-opendrim-lib.patch

Subscribers

People subscribed via source and target branches