[Pkg-erlang-commits] r1339 - in yaws/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2011-06-13 12:35:13 +0000 (Mon, 13 Jun 2011)
New Revision: 1339

Added:
   yaws/trunk/debian/patches/m32m64.diff
Modified:
   yaws/trunk/debian/changelog
   yaws/trunk/debian/patches/series
Log:
[yaws]
  * Removed -m32 and -m64 gcc command line option which led to FTBFS on
    ia64 and s390 architectures.


Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog	2011-06-13 12:16:15 UTC (rev 1338)
+++ yaws/trunk/debian/changelog	2011-06-13 12:35:13 UTC (rev 1339)
@@ -1,8 +1,9 @@
-yaws (1.90-2) UNRELEASED; urgency=low
+yaws (1.90-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Removed -m32 and -m64 gcc command line option which led to FTBFS on
+    ia64 and s390 architectures.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 13 Jun 2011 15:41:53 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 13 Jun 2011 16:34:40 +0400
 
 yaws (1.90-1) unstable; urgency=low
 

Added: yaws/trunk/debian/patches/m32m64.diff
===================================================================
--- yaws/trunk/debian/patches/m32m64.diff	                        (rev 0)
+++ yaws/trunk/debian/patches/m32m64.diff	2011-06-13 12:35:13 UTC (rev 1339)
@@ -0,0 +1,45 @@
+Patch by Sergei Golovan removes -m32 or -m64 gcc command line options
+(which lead to FTBFS) for all non-x86* architectures.
+
+--- yaws-1.90.orig/configure
++++ yaws-1.90/configure
+@@ -3998,15 +3998,15 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: found 64-bit Erlang" >&5
+ $as_echo "$as_me: found 64-bit Erlang" >&6;}
+                    case "$host_cpu" in
+-                       x86_64) CBIT= ;;
+-                       *) CBIT=-m64 ;;
++                       i?86) CBIT=-m64 ;;
++                       *) CBIT= ;;
+                    esac
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: found 32-bit Erlang" >&5
+ $as_echo "$as_me: found 32-bit Erlang" >&6;}
+                    case "$host_cpu" in
+-                       i?86) CBIT= ;;
+-                       *) CBIT=-m32 ;;
++                       x86_64) CBIT=-m32 ;;
++                       *) CBIT= ;;
+                    esac
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+--- yaws-1.90.orig/configure.in
++++ yaws-1.90/configure.in
+@@ -208,13 +208,13 @@
+                                8 -> 0; 4 -> 1 end)])],
+ 	       [AC_MSG_NOTICE(found 64-bit Erlang)
+                    case "$host_cpu" in
+-                       x86_64) CBIT= ;;
+-                       *) CBIT=-m64 ;;
++                       i?86) CBIT=-m64 ;;
++                       *) CBIT= ;;
+                    esac],
+ 	       [AC_MSG_NOTICE(found 32-bit Erlang)
+                    case "$host_cpu" in
+-                       i?86) CBIT= ;;
+-                       *) CBIT=-m32 ;;
++                       x86_64) CBIT=-m32 ;;
++                       *) CBIT= ;;
+                    esac])
+            CFLAGS="$CFLAGS $CBIT"
+            LD_SHARED="$CC $CBIT -shared"

Modified: yaws/trunk/debian/patches/series
===================================================================
--- yaws/trunk/debian/patches/series	2011-06-13 12:16:15 UTC (rev 1338)
+++ yaws/trunk/debian/patches/series	2011-06-13 12:35:13 UTC (rev 1339)
@@ -6,3 +6,4 @@
 man.diff
 ctl.diff
 docs.diff
+m32m64.diff