[med-svn] r8316 - trunk/packages/micromanager/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-27 15:21:33 +0000 (Thu, 27 Oct 2011)
New Revision: 8316

Added:
   trunk/packages/micromanager/trunk/debian/patches/fixuplinking.patch
Modified:
   trunk/packages/micromanager/trunk/debian/patches/series
Log:
fix linking issue

Added: trunk/packages/micromanager/trunk/debian/patches/fixuplinking.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixuplinking.patch	                        (rev 0)
+++ trunk/packages/micromanager/trunk/debian/patches/fixuplinking.patch	2011-10-27 15:21:33 UTC (rev 8316)
@@ -0,0 +1,26 @@
+Without this patch here is what I get:
+
+$ ldd -r /usr/lib/jni/libMMCoreJ_wrap.so
+[...]
+undefined symbol: pthread_mutexattr_settype	(/usr/lib/jni/libMMCoreJ_wrap.so)
+undefined symbol: deflate	(/usr/lib/jni/libMMCoreJ_wrap.so)
+undefined symbol: deflateEnd	(/usr/lib/jni/libMMCoreJ_wrap.so)
+undefined symbol: pthread_mutexattr_destroy	(/usr/lib/jni/libMMCoreJ_wrap.so)
+undefined symbol: pthread_create	(/usr/lib/jni/libMMCoreJ_wrap.so)
+undefined symbol: pthread_mutexattr_init	(/usr/lib/jni/libMMCoreJ_wrap.so)
+undefined symbol: deflateInit2_	(/usr/lib/jni/libMMCoreJ_wrap.so)
+undefined symbol: pthread_join	(/usr/lib/jni/libMMCoreJ_wrap.so)
+
+Index: micromanager-1.4.6/MMCoreJ_wrap/Makefile.am
+===================================================================
+--- micromanager-1.4.6.orig/MMCoreJ_wrap/Makefile.am	2011-10-27 17:17:25.000000000 -0400
++++ micromanager-1.4.6/MMCoreJ_wrap/Makefile.am	2011-10-27 17:18:03.000000000 -0400
+@@ -36,7 +36,7 @@
+         $(top_srcdir)/MMCore/Host.cpp
+  
+ #not sure if Boost linking is needed
+-libMMCoreJ_wrap_la_LDFLAGS = -Wl, -module -ldl $(BOOST_LDFLAGS)
++libMMCoreJ_wrap_la_LDFLAGS = -Wl, -module -ldl $(BOOST_LDFLAGS) $(LPTHREAD) $(LIBZLIB)
+ 
+ $(srcdir)/MMCoreJ.jar:  MMCoreJ_wrap.cxx \
+ 	libMMCoreJ_wrap.la \

Modified: trunk/packages/micromanager/trunk/debian/patches/series
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/series	2011-10-27 14:51:24 UTC (rev 8315)
+++ trunk/packages/micromanager/trunk/debian/patches/series	2011-10-27 15:21:33 UTC (rev 8316)
@@ -4,3 +4,4 @@
 fixupfreeimage.patch
 fixupgphoto2.patch
 removeinstallrule.patch
+fixuplinking.patch