Update gcc-optflags.patch
authorAlessio Treglia <alessio@debian.org>
Tue, 6 Mar 2012 23:01:38 +0000 (00:01 +0100)
committerAlessio Treglia <alessio@debian.org>
Tue, 6 Mar 2012 23:01:38 +0000 (00:01 +0100)
debian/patches/gcc-optflags.patch

index d9ad7149e40aaaf84f5dbb6b31081092f931dddf..ee04b5b8a63a9bade3e91310d44340748b0e71eb 100644 (file)
@@ -2,12 +2,12 @@ Subject: Add -O2 to CFLAGS by default, -O0 if noopt is set.
 Author: Alessio Treglia <alessio@debian.org>
 Forwarded: not-needed
 ---
- configure |   10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
+ configure |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- gpac.orig/configure
 +++ gpac/configure
-@@ -312,7 +312,7 @@ for opt do
+@@ -315,7 +315,7 @@ for opt do
              ;;
          --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
              ;;
@@ -16,19 +16,12 @@ Forwarded: not-needed
              ;;
          --disable-opt) no_gcc_opt="yes"
              ;;
-@@ -594,13 +594,9 @@ fi
+@@ -599,7 +599,7 @@ fi
  
  #GCC opt
  if test "$no_gcc_opt" = "no"; then
--    if $cc --version | grep 'sbox-arm-linux-gcc (GCC) 3.4.4'
--    then
--        echo "Detected buggy arm GCC (diablo), using -O2"
-         CFLAGS="-O2 $CFLAGS"
--    else
--        CFLAGS="-O3 $CFLAGS"
--    fi
-+else
-+    CFLAGS="-O0 $CFLAGS"
+-    CFLAGS="-O3 $CFLAGS"
++    CFLAGS="-O2 $CFLAGS"
+ else
+     CFLAGS="-O0 $CFLAGS"
  fi