Merge lp:~scarneiro/ubuntu/oneiric/opendrim-lmp-powersupply/fix-for-755954 into lp:ubuntu/oneiric/opendrim-lmp-powersupply

[Sebastian Carneiro]

Added library to linker parameters of tests to fix ftbfs related to toolchain defaults change.

[Stefano Rivera (stefanor)]

See my review on https://code.launchpad.net/~scarneiro/ubuntu/oneiric/opendrim-lmp-boot/fix-for-755942/+merge/66544

review: Needs Fixing

[Martin Pitt (pitti)]

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!

[Sebastian Carneiro (scarneiro)]

Of course, Martin.

Reverted previous changes, and added patch to file acinclude.m4 to add the library centrally. Sent the patch upstream: https://sourceforge.net/apps/trac/opendrim/ticket/2

[Stefano Rivera (stefanor)]

I don't think it's worth forwarding all of these as separate patches to the same bugtracker (as long as the changes are identical). That just seems like unnecessary bureaucracy. Just listing the affected components in the bug should be sufficient.

Anyway, this branch looks good.

review: Approve

[Stefano Rivera (stefanor)]

Actually, the changelog entry was badly formatted. There should be 2 spaces before the bulleted list.
dch should do the right thing.

I fixed it up on upload.

=== modified file 'acinclude.m4'
--- acinclude.m4	2010-06-11 15:04:00 +0000
+++ acinclude.m4	2011-07-06 18:21:36 +0000
@@ -261,6 +261,7 @@
 	if test -e $OPENDRIMCOMMONLIBDIR/libopendrim.so
 	then
 		AC_MSG_RESULT(yes)
+		LIBS="${LIBS} -lopendrim"
 	else
 		AC_MSG_ERROR([[no. The OpenDRIM Common library could not be found (libopendrim.so)]])
 	fi

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-11 15:04:00 +0000
+++ debian/changelog	2011-07-06 18:21:36 +0000
@@ -1,3 +1,11 @@
+opendrim-lmp-powersupply (1.0.0-0ubuntu2) oneiric; urgency=low
+
+* debian/patches/01-ftbfs-add-openldrim-lib.patch: Added library opendrim to
+  LIBS variable in check routine of acinclude.m4 to build with ld
+  --no-as-needed (LP: #755954)
+
+ -- Sebastian Carneiro <[e-mail]>  Wed, 06 Jul 2011 15:16:34 -0300
+
 opendrim-lmp-powersupply (1.0.0-0ubuntu1) maverick; urgency=low
 
   * Initial release

=== added directory 'debian/patches'
=== added file 'debian/patches/01-ftbfs-add-opendrim-lib.patch'
--- debian/patches/01-ftbfs-add-opendrim-lib.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01-ftbfs-add-opendrim-lib.patch	2011-07-06 18:21:36 +0000
@@ -0,0 +1,20 @@
+Description: To fix FTBFS because of changes in defaults for toolchain (binutils)
+ it is necessary to include library opendrim at linking time. This patch modifies
+ acinclude.m4 adding such library to the LIBS variable.
+ .
+Forwarded: http://sourceforge.net/apps/trac/opendrim/ticket/2
+Author: Sebastian Carneiro <[e-mail]>
+Last-Update: 2011-07-03
+
+Index: opendrim-lmp-powersupply/acinclude.m4
+===================================================================
+--- opendrim-lmp-powersupply.orig/acinclude.m4	2011-07-03 19:27:57.607093001 -0300
++++ opendrim-lmp-powersupply/acinclude.m4	2011-07-03 19:28:54.056969358 -0300
+@@ -261,6 +261,7 @@
+ 	if test -e $OPENDRIMCOMMONLIBDIR/libopendrim.so
+ 	then
+ 		AC_MSG_RESULT(yes)
++		LIBS="${LIBS} -lopendrim"
+ 	else
+ 		AC_MSG_ERROR([[no. The OpenDRIM Common library could not be found (libopendrim.so)]])
+ 	fi

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-07-06 18:21:36 +0000
@@ -0,0 +1,1 @@
+01-ftbfs-add-opendrim-lib.patch