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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-27 15:28:40 +0000 (Thu, 27 Oct 2011)
New Revision: 8317

Added:
   trunk/packages/micromanager/trunk/debian/patches/fixuplibz.patch
Modified:
   trunk/packages/micromanager/trunk/debian/patches/series
Log:
fix linking (R_X86_64_32S issue)

Added: trunk/packages/micromanager/trunk/debian/patches/fixuplibz.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixuplibz.patch	                        (rev 0)
+++ trunk/packages/micromanager/trunk/debian/patches/fixuplibz.patch	2011-10-27 15:28:40 UTC (rev 8317)
@@ -0,0 +1,21 @@
+Index: micromanager-1.4.6/configure.in
+===================================================================
+--- micromanager-1.4.6.orig/configure.in	2011-10-27 17:27:14.000000000 +0200
++++ micromanager-1.4.6/configure.in	2011-10-27 17:27:35.000000000 +0200
+@@ -165,13 +165,13 @@
+    else 
+       AC_CHECK_HEADERS([$ZLIBINCDIR/zlib.h])
+       if test -z "$LIBZLIB" ; then
+-         AC_FIND_FILE([libz.a], [/usr/local/$ARCH/lib /usr/local/lib /usr/lib /usr/lib64 /usr/lib/$build_platform-$build_os], ZLIBLIBDIR)
++         AC_FIND_FILE([libz.so], [/usr/local/$ARCH/lib /usr/local/lib /usr/lib /usr/lib64 /usr/lib/$build_platform-$build_os], ZLIBLIBDIR)
+          if test x$ZLIBLIBDIR = xNO; then
+             AC_MSG_RESULT([zlib not found])
+             exit 1
+          else
+-            AC_MSG_RESULT([zlib.a found])
+-            LIBZLIB="$ZLIBLIBDIR/libz.a"
++            AC_MSG_RESULT([zlib.so found])
++            LIBZLIB="$ZLIBLIBDIR/libz.so"
+          fi 
+       fi 
+    fi 

Modified: trunk/packages/micromanager/trunk/debian/patches/series
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/series	2011-10-27 15:21:33 UTC (rev 8316)
+++ trunk/packages/micromanager/trunk/debian/patches/series	2011-10-27 15:28:40 UTC (rev 8317)
@@ -5,3 +5,4 @@
 fixupgphoto2.patch
 removeinstallrule.patch
 fixuplinking.patch
+fixuplibz.patch