Merge lp:~scarneiro/ubuntu/oneiric/opendrim-lmp-powermanagement/fix-for-756028 into lp:ubuntu/oneiric/opendrim-lmp-powermanagement

Proposed by Sebastian Carneiro
Status: Merged
Merged at revision: 3
Proposed branch: lp:~scarneiro/ubuntu/oneiric/opendrim-lmp-powermanagement/fix-for-756028
Merge into: lp:ubuntu/oneiric/opendrim-lmp-powermanagement
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-powermanagement/fix-for-756028
Reviewer Review Type Date Requested Status
Micah Gersten (community) Approve
Stefano Rivera Needs Fixing
Ubuntu branches Pending
Review via email: mp+66695@code.launchpad.net

Description of the change

Added library to linker parameters to fix ftbfs related to changes in toolchain defaults.

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :
review: Needs Fixing
Revision history for this message
Martin Pitt (pitti) wrote :

Can this be handled centrally like https://code.launchpad.net/~scarneiro/ubuntu/oneiric/opendrim-lmp-boot/fix-for-755942/+merge/66544 ? Also, as this is an upstream bug, can you please forward the patch there, too?

Please set back to "needs review" when you are done.

Thanks!

Revision history for this message
Sebastian Carneiro (scarneiro) wrote :

Previous changes reverted. Added a patch to acinclude.m4 to manage the adding of the opendrim library centrally. Updated upstream bug with patch:

 https://sourceforge.net/apps/trac/opendrim/ticket/1

Thanks, Martin.

5. By Sebastian Carneiro

Revert acinclude.m4 changed by mistake.

Revision history for this message
Micah Gersten (micahg) wrote :

Approved and upload, 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-06-11 15:01:00 +0000
3+++ debian/changelog 2011-07-07 00:19:32 +0000
4@@ -1,3 +1,11 @@
5+opendrim-lmp-powermanagement (1.0.0-0ubuntu2) oneiric; urgency=low
6+
7+ * debian/patches/01-ftbfs-add-openldrim-lib.patch: Added library opendrim to
8+ LIBS variable in check routine of acinclude.m4 to build with ld
9+ --as-needed (LP: #756028)
10+
11+ -- Sebastian Carneiro <scarneiro@fibertel.com.ar> Wed, 06 Jul 2011 21:10:52 -0300
12+
13 opendrim-lmp-powermanagement (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 00:19:32 +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-powermanagement/acinclude.m4
31+===================================================================
32+--- opendrim-lmp-powermanagement.orig/acinclude.m4 2011-07-06 10:02:09.417179001 -0300
33++++ opendrim-lmp-powermanagement/acinclude.m4 2011-07-06 10:02:42.107130578 -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 00:19:32 +0000
46@@ -0,0 +1,1 @@
47+01-ftbfs-add-opendrim-lib.patch

Subscribers

People subscribed via source and target branches