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,9 +24,10 @@
   4  OPTIMIZE = boolean_option("OPTIMIZE")
   5  CC       = string_option("CC", "gcc")
   6  CXX      = string_option("CXX", "g++")
   7 +CXXFLAGS = string_option("CXXFLAGS", "")
   8  # TODO: consider -fcommon
   9  if OPTIMIZE
  10 -       OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip
  11 +       OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DBOOST_DISABLE_ASSERTS".strip
  12  else
  13         OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip
  14  end
  15 @@ -32,10 +33,11 @@
  16
  17  # Extra compiler flags that should always be passed to the C/C++ compiler.
  18  # Should be included last in the command string, even after PlatformInfo.portability_cflags.
  19 -EXTRA_CXXFLAGS = "-Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long"
  20 +EXTRA_CXXFLAGS = "-Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long"
  21  EXTRA_CXXFLAGS << " -Wno-missing-field-initializers" if PlatformInfo.compiler_supports_wno_missing_field_initializers_flag?
  22  EXTRA_CXXFLAGS << " -mno-tls-direct-seg-refs" if PlatformInfo.requires_no_tls_direct_seg_refs? && PlatformInfo.compiler_supports_no_tls_direct_seg_refs_option?
  23  EXTRA_CXXFLAGS << " #{OPTIMIZATION_FLAGS}" if !OPTIMIZATION_FLAGS.empty?
  24 +EXTRA_CXXFLAGS << " #{CXXFLAGS}" if !CXXFLAGS.empty?
  25
  26  # Extra linker flags that should always be passed to the linker.
  27  # Should be included last in the command string, even after PlatformInfo.portability_ldflags.
  28 --- apache-mod_rails-3.0.5/ext/libev/configure.ac~      2011-03-11 12:11:27.000000000 +0100
  29 +++ apache-mod_rails-3.0.5/ext/libev/configure.ac       2011-03-31 11:39:27.773936137 +0200
  30 @@ -8,10 +8,6 @@
  31  AC_PROG_INSTALL
  32  AC_PROG_LIBTOOL
  33
  34 -if test "x$GCC" = xyes ; then
  35 -  CFLAGS="$CFLAGS -O3"
  36 -fi
  37 -
  38  m4_include([libev.m4])
  39
  40  AC_CONFIG_FILES([Makefile])