Merge lp:~scarneiro/ubuntu/oneiric/opendrim-lmp-softwareupdate/fix-for-755974 into lp:ubuntu/oneiric/opendrim-lmp-softwareupdate

[Sebastian Carneiro]

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

[Stefano Rivera (stefanor)]

See the review in 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)]

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.

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-11 15:46:00 +0000
+++ debian/changelog	2011-07-07 23:56:36 +0000
@@ -1,3 +1,11 @@
+opendrim-lmp-softwareupdate (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
+    --as-needed (LP: #755974)
+
+ -- Sebastian Carneiro <[e-mail]>  Thu, 07 Jul 2011 20:51:40 -0300
+
 opendrim-lmp-softwareupdate (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-07 23:56: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/1
+Author: Sebastian Carneiro <[e-mail]>
+Last-Update: 2011-07-07
+
+Index: opendrim-lmp-softwareupdate/acinclude.m4
+===================================================================
+--- opendrim-lmp-softwareupdate.orig/acinclude.m4	2011-07-06 09:26:32.217179002 -0300
++++ opendrim-lmp-softwareupdate/acinclude.m4	2011-07-06 09:27:16.117212462 -0300
+@@ -262,6 +262,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-07 23:56:36 +0000
@@ -0,0 +1,1 @@
+01-ftbfs-add-opendrim-lib.patch