apache-mod_rails-build.patch

   1 --- apache-mod_rails-3.0.5/build/config.rb~     2011-03-11 12:11:27.000000000 +0100
   2 +++ apache-mod_rails-3.0.5/build/config.rb      2011-03-30 22:02:43.754874026 +0200
   3 @@ -24,8 +24,9 @@
   4  OPTIMIZE = boolean_option("OPTIMIZE")
   5  CC       = string_option("CC", "gcc")
   6  CXX      = string_option("CXX", "g++")
   7 +CXXFLAGS = string_option("CXXFLAGS", "")
   8  if OPTIMIZE
   9 -       OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip
  10 +       OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DBOOST_DISABLE_ASSERTS".strip
  11  else
  12         OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip
  13  end
  14 @@ -32,7 +33,7 @@
  15
  16  # Extra compiler flags that should always be passed to the C/C++ compiler.
  17  # Should be included last in the command string, even after PlatformInfo.portability_cflags.
  18 -EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}".strip
  19 +EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS} #{CXXFLAGS}".strip
  20
  21  # Extra linker flags that should always be passed to the linker.
  22  # Should be included last in the command string, even after PlatformInfo.portability_ldflags.
  23 --- apache-mod_rails-3.0.5/build/documentation.rb~      2011-03-11 12:11:27.000000000 +0100
  24 +++ apache-mod_rails-3.0.5/build/documentation.rb       2011-03-31 11:16:37.399444136 +0200
  25 @@ -78,7 +78,6 @@
  26                 "lib/phusion_passenger/*.rb",
  27                 "lib/phusion_passenger/*/*.rb",
  28                 "ext/phusion_passenger/*.c")
  29 -       rd.template = "./doc/template/horo"
  30         rd.title = "Passenger Ruby API"
  31         rd.options << "-S" << "-N" << "-p" << "-H"
  32  end
  33 --- apache-mod_rails-3.0.5/ext/libev/configure.ac~      2011-03-11 12:11:27.000000000 +0100
  34 +++ apache-mod_rails-3.0.5/ext/libev/configure.ac       2011-03-31 11:39:27.773936137 +0200
  35 @@ -8,10 +8,6 @@
  36  AC_PROG_INSTALL
  37  AC_PROG_LIBTOOL
  38
  39 -if test "x$GCC" = xyes ; then
  40 -  CFLAGS="$CFLAGS -O3"
  41 -fi
  42 -
  43  m4_include([libev.m4])
  44
  45  AC_CONFIG_FILES([Makefile])