ardour-opt.patch

   1 --- ardour-0.9beta9.1/gtk_ardour/configure.ac.orig      2003-11-14 04:08:50.000000000 +0100
   2 +++ ardour-0.9beta9.1/gtk_ardour/configure.ac   2004-02-11 00:56:11.989904752 +0100
   3 @@ -84,15 +84,18 @@
   4  fi
   5
   6
   7 -CXXFLAGS="-g -D_REENTRANT"
   8 -CFLAGS="-g -D_REENTRANT"
   9 +# eeh, /proc/cpuinfo is evil in distro builds
  10 +OPT_FLAGS="-D_REENTRANT -fomit-frame-pointer -ffast-math"
  11 +CXXFLAGS="$CXXFLAGS -D_REENTRANT"
  12 +CFLAGS="$CFLAGS -D_REENTRANT"
  13  if test x"$GXX" = xyes ; then
  14     CXXFLAGS="$CXXFLAGS -Wall"
  15     CFLAGS="$CFLAGS -Wall"
  16  fi
  17  if test x"$GXX" = xyes ; then
  18 -   OPT_CXXFLAGS="$OPT_FLAGS -Wall"
  19 +   OPT_CXXFLAGS="$CXXFLAGS $OPT_FLAGS -Wall"
  20  fi
  21 +OPT_FLAGS="$CFLAGS $OPT_FLAGS"
  22
  23  AC_ARG_ENABLE(optimize,
  24       [  --disable-optimize       avoid optimizations to allow gdb debugging.],
  25 --- ardour-0.9beta2/ksi_ardour/configure.ac.orig        2003-06-24 05:11:36.000000000 +0200
  26 +++ ardour-0.9beta2/ksi_ardour/configure.ac     2003-07-15 01:30:39.000000000 +0200
  27 @@ -32,8 +32,7 @@
  28     AC_MSG_ERROR([*** aes is written in C++. You don't appear to have a C++ compiler])
  29  fi
  30
  31 -CXXFLAGS="-g"
  32 -OPT_CXXFLAGS="-O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
  33 +OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
  34  if test x"$GXX" = xyes ; then
  35     CXXFLAGS="$CXXFLAGS -Wall"
  36  fi
  37 --- ardour-0.9beta9.1/libs/ardour/configure.ac.orig     2004-01-16 01:47:46.000000000 +0100
  38 +++ ardour-0.9beta9.1/libs/ardour/configure.ac  2004-02-11 00:57:49.568070616 +0100
  39 @@ -84,12 +84,14 @@
  40  fi
  41
  42
  43 -CXXFLAGS="-g -D_REENTRANT"
  44 +# eeh, /proc/cpuinfo is evil in distro builds
  45 +OPT_FLAGS="-D_REENTRANT -fomit-frame-pointer -ffast-math"
  46 +CXXFLAGS="$CXXFLAGS -D_REENTRANT"
  47  if test x"$GXX" = xyes ; then
  48     CXXFLAGS="$CXXFLAGS -Wall"
  49  fi
  50  if test x"$GXX" = xyes ; then
  51 -   OPT_CXXFLAGS="$OPT_FLAGS -Wall"
  52 +   OPT_CXXFLAGS="$CXXFLAGS $OPT_FLAGS -Wall"
  53  fi
  54
  55  AC_ARG_ENABLE(optimize,
  56 --- ardour-0.9beta2/libs/gtkmmext/configure.ac.orig     2003-06-24 05:11:38.000000000 +0200
  57 +++ ardour-0.9beta2/libs/gtkmmext/configure.ac  2003-07-15 01:33:24.000000000 +0200
  58 @@ -37,10 +37,10 @@
  59     AC_MSG_ERROR([*** libmidi is C++. You don't appear to have a C++ compiler])
  60  fi
  61
  62 -CXXFLAGS="-g -D_REENTRANT"
  63 -OPT_CXXFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
  64 -CFLAGS="-g -D_REENTRANT"
  65 -OPT_CFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
  66 +CXXFLAGS="$CXXFLAGS -D_REENTRANT"
  67 +OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
  68 +CFLAGS="$CLFAGS -D_REENTRANT"
  69 +OPT_CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
  70  if test x"$GXX" = xyes ; then
  71     CXXFLAGS="$CXXFLAGS -Wall"
  72  fi
  73 --- ardour-0.9beta2/libs/midi++/configure.ac.orig       2003-06-24 05:11:39.000000000 +0200
  74 +++ ardour-0.9beta2/libs/midi++/configure.ac    2003-07-15 01:33:48.000000000 +0200
  75 @@ -48,8 +48,8 @@
  76     AC_MSG_ERROR([*** libmidi is C++. You don't appear to have a C++ compiler])
  77  fi
  78
  79 -CXXFLAGS="-g -D_REENTRANT"
  80 -OPT_CXXFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
  81 +CXXFLAGS="$CXXFLAGS -D_REENTRANT"
  82 +OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
  83  if test x"$GXX" = xyes ; then
  84     CXXFLAGS="$CXXFLAGS -Wall"
  85  fi
  86 --- ardour-0.9beta2/libs/pbd/configure.ac.orig  2003-06-24 05:11:39.000000000 +0200
  87 +++ ardour-0.9beta2/libs/pbd/configure.ac       2003-07-15 01:34:11.000000000 +0200
  88 @@ -32,8 +32,8 @@
  89     AC_MSG_ERROR([*** libpbd is C++. You don't appear to have a C++ compiler])
  90  fi
  91
  92 -CXXFLAGS="-g -D_REENTRANT"
  93 -OPT_CXXFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
  94 +CXXFLAGS="$CXXFLAGS -D_REENTRANT"
  95 +OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
  96  if test x"$GXX" = xyes ; then
  97     CXXFLAGS="$CXXFLAGS -Wall"
  98  fi
  99 --- ardour-0.9beta2/libs/soundtouch/configure.ac.orig   2003-03-01 03:53:20.000000000 +0100
 100 +++ ardour-0.9beta2/libs/soundtouch/configure.ac        2003-07-15 01:34:34.000000000 +0200
 101 @@ -35,8 +35,8 @@
 102     AC_MSG_ERROR([*** libpbd is C++. You don't appear to have a C++ compiler])
 103  fi
 104
 105 -CXXFLAGS="-g -D_REENTRANT"
 106 -OPT_CXXFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
 107 +CXXFLAGS="$CXXFLAGS -D_REENTRANT"
 108 +OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
 109  if test x"$GXX" = xyes ; then
 110     CXXFLAGS="$CXXFLAGS -Wall"
 111  fi