[SCM] phasex packaging branch, master, updated. debian/0.12.0.pre1-2-2-g7261cc4

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7261cc441b4fcdca9ca611062ed77afd191bb8e7
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jul 27 17:36:41 2010 +0200

    Add patch to fix FTBFS on several architectures (Closes: #590273).

diff --git a/debian/patches/02-gcc_flags.patch b/debian/patches/02-gcc_flags.patch
new file mode 100644
index 0000000..c674247
--- /dev/null
+++ b/debian/patches/02-gcc_flags.patch
@@ -0,0 +1,56 @@
+Description: Disable optimization to fix FTBFS on several architectures.
+Author: Alessio Treglia <alessio at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=590273
+Forwarded: not-needed
+---
+ configure.ac |   13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+--- phasex.orig/configure.ac
++++ phasex/configure.ac
+@@ -176,16 +176,15 @@ case "$OPT_ARCH" in
+ 	"none"|"generic")
+ 		CPU_POWER_LEVEL=2
+ 		if test "$(($gccmajor >= 4))" = "1" && test "$(($gccminor >= 2))" = "1"; then
+-			ARCH_OPT_CFLAGS="-mtune=generic"
++			ARCH_OPT_CFLAGS=""
+ 			WARNING=`echo "*" && \
+ 				 echo "* WARNING:  No arch specific optimization has been specified." && \
+ 				 echo "*           Try --enable-arch=native !!!" && \
+ 				 echo "*"`
+ 		else
+-			ARCH_OPT_CFLAGS="-mtune=i686 -march=i386"
++			ARCH_OPT_CFLAGS=""
+ 			WARNING=`echo "*" && \
+ 				 echo "* WARNING:  No arch specific optimization has been specified." && \
+-				 echo "*           Defaulting to i686 tuning for i386 CPU !!!" && \
+ 				 echo "*"`
+ 		fi
+ 		ARCH_MATH_CFLAGS=""
+@@ -386,7 +385,7 @@ case "$OPT_ARCH" in
+ 
+ 	*)
+ 		CPU_POWER_LEVEL=2
+-		ARCH_OPT_CFLAGS="-mtune=$OPT_ARCH -march=$OPT_ARCH"
++		ARCH_OPT_CFLAGS=""
+ 		ARCH_MATH_CFLAGS=""
+ 		;;
+ esac
+@@ -418,14 +417,14 @@ fi
+ case "$DEBUG_CFLAGS" in
+ 	"none")
+ 		DEBUG_CFLAGS=""
+-		OPT_CFLAGS="-pipe -Wcast-align $ARCH_OPT_CFLAGS -m$ARCH_BITS $ARCH_MATH_CFLAGS -O3 -ffast-math -fomit-frame-pointer"
++		OPT_CFLAGS="-pipe -Wcast-align $ARCH_OPT_CFLAGS $ARCH_MATH_CFLAGS -O3 -ffast-math -fomit-frame-pointer"
+ 		;;
+ 	"yes")
+ 		DEBUG_CFLAGS=""
+-		OPT_CFLAGS="-g -pipe -Wall -Wcast-align $ARCH_OPT_CFLAGS -m$ARCH_BITS $ARCH_MATH_CFLAGS -O2 -ffast-math"
++		OPT_CFLAGS="-g -pipe -Wall -Wcast-align $ARCH_OPT_CFLAGS $ARCH_MATH_CFLAGS -O2 -ffast-math"
+ 		;;
+ 	*)
+-		OPT_CFLAGS="-g -pipe -Wall -Wcast-align $ARCH_OPT_CFLAGS -m$ARCH_BITS $ARCH_MATH_CFLAGS -O2 -ffast-math"
++		OPT_CFLAGS="-g -pipe -Wall -Wcast-align $ARCH_OPT_CFLAGS $ARCH_MATH_CFLAGS -O2 -ffast-math"
+ 		;;
+ esac
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 25bbf55..91c1ce0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-desktop_file.patch
+02-gcc_flags.patch

-- 
phasex packaging