[SCM] phasex/master: Refresh 02-gcc_flags.patch, 03-binutils_gold.patch patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2b4637d29aea8f8ed4b688bb79ef49833326bf33
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jan 12 20:13:22 2013 +0000

    Refresh 02-gcc_flags.patch, 03-binutils_gold.patch patches.

diff --git a/debian/patches/02-gcc_flags.patch b/debian/patches/02-gcc_flags.patch
index 6f14f16..7a9db61 100644
--- a/debian/patches/02-gcc_flags.patch
+++ b/debian/patches/02-gcc_flags.patch
@@ -3,31 +3,28 @@ 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(-)
+ configure.ac |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 --- phasex.orig/configure.ac
 +++ phasex/configure.ac
-@@ -183,16 +183,15 @@ case "$OPT_ARCH" in
+@@ -352,13 +352,13 @@ 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"
+ 		if test "x$gccver" \< "x4.2.0"; then
+-			ARCH_OPT_CFLAGS="-mtune=i686 -march=i386"
 +			ARCH_OPT_CFLAGS=""
  			WARNING=`echo "*" && \
  				 echo "* WARNING:  No arch specific optimization has been specified." && \
- 				 echo "*           Try --enable-arch=native !!!" && \
+ 				 echo "*           Defaulting to i686 tuning for i386 CPU !!!" && \
  				 echo "*"`
  		else
--			ARCH_OPT_CFLAGS="-mtune=i686 -march=i386"
+-			ARCH_OPT_CFLAGS="-mtune=generic"
 +			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=""
-@@ -393,7 +392,7 @@ case "$OPT_ARCH" in
+ 				 echo "*           Try --enable-arch=native !!!" && \
+@@ -610,7 +610,7 @@ case "$OPT_ARCH" in
  
  	*)
  		CPU_POWER_LEVEL=2
@@ -36,21 +33,22 @@ Forwarded: not-needed
  		ARCH_MATH_CFLAGS=""
  		;;
  esac
-@@ -425,14 +424,14 @@ fi
+@@ -646,15 +646,15 @@ 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"
+-		OPT_CFLAGS="-pipe -Wall $ARCH_OPT_CFLAGS -m$ARCH_BITS $ARCH_MATH_CFLAGS -O3 -ffast-math -fomit-frame-pointer -fsingle-precision-constant"
++		OPT_CFLAGS="-pipe -Wall $ARCH_OPT_CFLAGS $ARCH_MATH_CFLAGS -O3 -ffast-math -fomit-frame-pointer -fsingle-precision-constant"
  		;;
  	"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"
+ 		DEBUG_CFLAGS="-g"
+-		OPT_CFLAGS="-pipe -Wall -Wcast-align -Wconversion -Wextra $ARCH_OPT_CFLAGS -m$ARCH_BITS $ARCH_MATH_CFLAGS -O2 -ffast-math -fsingle-precision-constant"
++		OPT_CFLAGS="-pipe -Wall -Wcast-align -Wconversion -Wextra $ARCH_OPT_CFLAGS $ARCH_MATH_CFLAGS -O2 -ffast-math -fsingle-precision-constant"
  		;;
  	*)
--		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"
+ 		DEBUG_CFLAGS="-g"
+-		OPT_CFLAGS="-pipe -Wall -Wcast-align -Wconversion -Wextra $ARCH_OPT_CFLAGS -m$ARCH_BITS $ARCH_MATH_CFLAGS -fsingle-precision-constant"
++		OPT_CFLAGS="-pipe -Wall -Wcast-align -Wconversion -Wextra $ARCH_OPT_CFLAGS $ARCH_MATH_CFLAGS -fsingle-precision-constant"
  		;;
  esac
  
diff --git a/debian/patches/03-binutils_gold.patch b/debian/patches/03-binutils_gold.patch
index 2629112..b38853a 100644
--- a/debian/patches/03-binutils_gold.patch
+++ b/debian/patches/03-binutils_gold.patch
@@ -6,14 +6,14 @@ Forwarded: yes
  src/Makefile.am |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- phasex-0.12.0+m1.orig/src/Makefile.am
-+++ phasex-0.12.0+m1/src/Makefile.am
-@@ -23,7 +23,7 @@ phasex_SOURCES = \
+--- phasex.orig/src/Makefile.am
++++ phasex/src/Makefile.am
+@@ -52,7 +52,7 @@ endif
  
- AM_CFLAGS   = @PHASEX_CFLAGS@
- AM_CPPFLAGS = $(EXTRA_CPPFLAGS) @PHASEX_CPPFLAGS@
--AM_LDFLAGS  = $(INTLLIBS) @PHASEX_LIBS@
-+LIBS  = $(INTLLIBS) @PHASEX_LIBS@ -lX11
+ AM_CFLAGS       = @PHASEX_CFLAGS@
+ AM_CPPFLAGS     = $(EXTRA_CPPFLAGS) @PHASEX_CPPFLAGS@
+-phasex_LDADD    = $(INTLLIBS) @PHASEX_LIBS@
++phasex_LDADD    = $(INTLLIBS) @PHASEX_LIBS@ -lX11
  
- distclean-local:
- 	rm -f *~
+ 
+ clean-local:

-- 
phasex packaging