git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/libvorbis.patch

   1 diff -ruN libvorbis-1.1.1/configure.in libvorbis/configure.in
   2 --- libvorbis-1.1.1/configure.in        2005-06-21 15:47:45.000000000 +0200
   3 +++ libvorbis/configure.in      2005-11-14 22:40:18.000000000 +0100
   4 @@ -86,15 +86,15 @@
   5                         CC=cc
   6                 fi
   7                 DEBUG="-g -signed"
   8 -               CFLAGS="-O2 -w -signed"
   9 +               EXTRA_CFLAGS="-O2 -w -signed"
  10                 PROFILE="-p -g3 -O2 -signed" ;;
  11         sparc-sun-solaris*)
  12                 DEBUG="-v -g"
  13 -               CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
  14 +               EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
  15                 PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
  16         *)
  17                 DEBUG="-g"
  18 -               CFLAGS="-O"
  19 +               EXTRA_CFLAGS="-O"
  20                 PROFILE="-g -p" ;;
  21          esac
  22  else
  23 @@ -102,7 +102,7 @@
  24         case $host in
  25         *86-*-linux*)
  26                 DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
  27 -               CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
  28 +               EXTRA_CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
  29  #                      PROFILE="-Wall -W -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
  30                 PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
  31
  32 @@ -142,33 +142,33 @@
  33   AC_MSG_WARN([********************************************************])
  34   AC_MSG_WARN([                                                        ])
  35
  36 -               CFLAGS=${OPT}" -D__NO_MATH_INLINES"
  37 +               EXTRA_CFLAGS=${OPT}" -D__NO_MATH_INLINES"
  38                 PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
  39                 fi;;
  40         powerpc-*-linux*)
  41                 DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES"
  42 -               CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
  43 +               EXTRA_CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
  44                 PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
  45         *-*-linux*)
  46                 DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
  47 -               CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
  48 +               EXTRA_CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
  49                 PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
  50         sparc-sun-*)
  51                 DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8"
  52 -               CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
  53 +               EXTRA_CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
  54                 PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
  55         *-*-darwin*)
  56                 DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
  57 -               CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
  58 +               EXTRA_CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
  59                 PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
  60         *)
  61                 DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
  62 -               CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
  63 +               EXTRA_CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
  64                 PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
  65          esac
  66  fi
  67 -CFLAGS="$CFLAGS $cflags_save"
  68 +CFLAGS="$EXTRA_CFLAGS $cflags_save"
  69
  70  dnl --------------------------------------------------
  71  dnl Check for headers