diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2010-12-13 10:38:57 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2010-12-13 10:38:57 +0000 |
| commit | 6c64e975d7043cf1188d096b57a09f6fe5a7c7da (patch) | |
| tree | 2f877d30e68f0c1f536361528312ebd6d3735eb2 /www-servers/nginx/files | |
| parent | Added mask for nginx-0.8.53-r1 to test the passenger-3.0.1 module (diff) | |
| download | historical-6c64e975d7043cf1188d096b57a09f6fe5a7c7da.tar.gz historical-6c64e975d7043cf1188d096b57a09f6fe5a7c7da.tar.bz2 historical-6c64e975d7043cf1188d096b57a09f6fe5a7c7da.zip | |
Revision bump to bump passenger to 3.0.1 (currently p.masked for testing). Removed old versions.
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'www-servers/nginx/files')
3 files changed, 52 insertions, 0 deletions
diff --git a/www-servers/nginx/files/passenger-3.0.1-cflags.patch b/www-servers/nginx/files/passenger-3.0.1-cflags.patch new file mode 100644 index 000000000000..ff798fe26c4a --- /dev/null +++ b/www-servers/nginx/files/passenger-3.0.1-cflags.patch @@ -0,0 +1,24 @@ +diff --git a/build/config.rb b/build/config.rb +index 8905bd8..64199fb 100644 +--- a/build/config.rb ++++ b/build/config.rb +@@ -24,11 +24,7 @@ + OPTIMIZE = boolean_option("OPTIMIZE") + CC = string_option("CC", "gcc") + CXX = string_option("CXX", "g++") +-if OPTIMIZE +- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip +-else +- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip +-end ++OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG -DBOOST_DISABLE_ASSERTS".strip + + # 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. +@@ -39,4 +35,4 @@ EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}".strip + EXTRA_LDFLAGS = "" + + # Whether to use the vendored libev or the system one. +-USE_VENDORED_LIBEV = boolean_option("USE_VENDORED_LIBEV", true) +\ No newline at end of file ++USE_VENDORED_LIBEV = false diff --git a/www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch b/www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch new file mode 100644 index 000000000000..c4c6cae6f191 --- /dev/null +++ b/www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch @@ -0,0 +1,16 @@ +from http://code.google.com/p/phusion-passenger/issues/detail?id=595 + +--- ../passenger-3.0.1/ext/nginx/config.orig 2010-12-08 13:48:23.964424406 +0000 ++++ ../passenger-3.0.1/ext/nginx/config 2010-12-08 13:49:12.078865225 +0000 +@@ -2,10 +2,7 @@ + ! test -f "$ngx_addon_dir/../common/libboost_oxt.a"; then + echo "*** The Phusion Passenger support files are not yet compiled. Compiling them for you... ***" + echo "*** Running 'rake nginx RELEASE=yes' in $ngx_addon_dir... ***" +- if ! cd $ngx_addon_dir; then +- exit 1 +- fi +- if ! rake nginx RELEASE=yes; then ++ if ! (cd $ngx_addon_dir && rake nginx RELEASE=yes) then + exit 1 + fi + echo "*** Phusion Passenger support files have been successfully compiled. ***" diff --git a/www-servers/nginx/files/passenger-3.0.1-missing-include.patch b/www-servers/nginx/files/passenger-3.0.1-missing-include.patch new file mode 100644 index 000000000000..3f0223b31f47 --- /dev/null +++ b/www-servers/nginx/files/passenger-3.0.1-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/ext/common/RandomGenerator.h b/ext/common/RandomGenerator.h +index 4a72a5e..836bf66 100644 +--- a/ext/common/RandomGenerator.h ++++ b/ext/common/RandomGenerator.h +@@ -26,6 +26,7 @@ + #define _PASSENGER_RANDOM_GENERATOR_H_ + + #include <string> ++#include <cerrno> + + #include <boost/noncopyable.hpp> + #include <boost/shared_ptr.hpp> |