[med-svn] r2244 - trunk/packages/maq/trunk/debian/patches

[tille at alioth.debian.org]

Author: tille
Date: 2008-07-16 10:18:01 +0000 (Wed, 16 Jul 2008)
New Revision: 2244

Added:
   trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch
Modified:
   trunk/packages/maq/trunk/debian/patches/series
Log:
Rude patch which simply removes -m64 option from configure script because this multiarch option introduces several hassle


Added: trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch
===================================================================
--- trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch	                        (rev 0)
+++ trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch	2008-07-16 10:18:01 UTC (rev 2244)
@@ -0,0 +1,51 @@
+--- maq-0.6.7.orig/configure
++++ maq-0.6.7/configure
+@@ -3600,7 +3600,7 @@
+ fi
+ 
+ 	case $is_uni in
+-	  1) CFLAGS="-m64"
++	  1) CFLAGS=""
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3643,7 +3643,7 @@
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;;
+-	  0) CFLAGS="-m64"
++	  0) CFLAGS=""
+ 	  	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3676,7 +3676,7 @@
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  ext_CFLAGS="-m64"
++  ext_CFLAGS=""
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -3687,9 +3687,9 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;;
+ 	esac;;
+   *)
+-    { echo "$as_me:$LINENO: checking if gcc accepts -m64" >&5
+-echo $ECHO_N "checking if gcc accepts -m64... $ECHO_C" >&6; }
+-    CFLAGS="-m64"
++    { echo "$as_me:$LINENO: checking if gcc accepts -m64 ... this is ignored on Debian GNU/Linux" >&5
++echo $ECHO_N "checking if gcc accepts -m64... $ECHO_C ... this is ignored on Debian GNU/Linux" >&6; }
++    CFLAGS=""
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3722,7 +3722,7 @@
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  ext_CFLAGS="-m64"; { echo "$as_me:$LINENO: result: yes" >&5
++  ext_CFLAGS=""; { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ else
+   echo "$as_me: failed program was:" >&5

Modified: trunk/packages/maq/trunk/debian/patches/series
===================================================================
--- trunk/packages/maq/trunk/debian/patches/series	2008-07-16 10:16:20 UTC (rev 2243)
+++ trunk/packages/maq/trunk/debian/patches/series	2008-07-16 10:18:01 UTC (rev 2244)
@@ -1 +1,2 @@
 20_perl_path.patch
+10_prevent_-64_option.patch