- use our CXXFLAGS/CFLAGS

[packages/passenger.git] / apache-mod_rails-build.patch

diff --git a/apache-mod_rails-build.patch b/apache-mod_rails-build.patch
new file mode 100644 (file)
index 0000000..671bbfd
--- /dev/null
+++ b/apache-mod_rails-build.patch
@@ -0,0 +1,45 @@
+--- apache-mod_rails-3.0.5/build/config.rb~    2011-03-11 12:11:27.000000000 +0100
++++ apache-mod_rails-3.0.5/build/config.rb     2011-03-30 22:02:43.754874026 +0200
+@@ -24,8 +24,9 @@
+ OPTIMIZE = boolean_option("OPTIMIZE")
+ CC       = string_option("CC", "gcc")
+ CXX      = string_option("CXX", "g++")
++CXXFLAGS = string_option("CXXFLAGS", "")
+ if OPTIMIZE
+-      OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip
++      OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DBOOST_DISABLE_ASSERTS".strip
+ else
+       OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip
+ end
+@@ -32,7 +33,7 @@
+ 
+ # Extra compiler flags that should always be passed to the C/C++ compiler.
+ # Should be included last in the command string, even after PlatformInfo.portability_cflags.
+-EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}".strip
++EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS} #{CXXFLAGS}".strip
+ 
+ # Extra linker flags that should always be passed to the linker.
+ # Should be included last in the command string, even after PlatformInfo.portability_ldflags.
+--- apache-mod_rails-3.0.5/build/documentation.rb~     2011-03-11 12:11:27.000000000 +0100
++++ apache-mod_rails-3.0.5/build/documentation.rb      2011-03-31 11:16:37.399444136 +0200
+@@ -78,7 +78,6 @@
+               "lib/phusion_passenger/*.rb",
+               "lib/phusion_passenger/*/*.rb",
+               "ext/phusion_passenger/*.c")
+-      rd.template = "./doc/template/horo"
+       rd.title = "Passenger Ruby API"
+       rd.options << "-S" << "-N" << "-p" << "-H"
+ end
+--- apache-mod_rails-3.0.5/ext/libev/configure.ac~     2011-03-11 12:11:27.000000000 +0100
++++ apache-mod_rails-3.0.5/ext/libev/configure.ac      2011-03-31 11:39:27.773936137 +0200
+@@ -8,10 +8,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+ 
+-if test "x$GCC" = xyes ; then
+-  CFLAGS="$CFLAGS -O3"
+-fi
+-
+ m4_include([libev.m4])
+ 
+ AC_CONFIG_FILES([Makefile])