[gentoo-commits] gentoo-x86 commit in www-servers/nginx/files: passenger-3.0.1-cflags.patch passenger-3.0.1-missing-auto-feature.patch passenger-3.0.1-missing-include.patch

[gentoo-commits] gentoo-x86 commit in www-servers/nginx/files: passenger-3.0.1-cflags.patch passenger-3.0.1-missing-auto-feature.patch passenger-3.0.1-missing-include.patch

[Tiziano Mueller (dev-zero)]

dev-zero    10/12/13 10:38:57

  Added:                passenger-3.0.1-cflags.patch
                        passenger-3.0.1-missing-auto-feature.patch
                        passenger-3.0.1-missing-include.patch
  Log:
  Revision bump to bump passenger to 3.0.1 (currently p.masked for testing). Removed old versions.
  
  (Portage version: 2.1.9.25/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  www-servers/nginx/files/passenger-3.0.1-cflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/passenger-3.0.1-cflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/passenger-3.0.1-cflags.patch?rev=1.1&content-type=text/plain

Index: passenger-3.0.1-cflags.patch
===================================================================
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



1.1                  www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/passenger-3.0.1-missing-auto-feature.patch?rev=1.1&content-type=text/plain

Index: passenger-3.0.1-missing-auto-feature.patch
===================================================================
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. ***"



1.1                  www-servers/nginx/files/passenger-3.0.1-missing-include.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/passenger-3.0.1-missing-include.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/passenger-3.0.1-missing-include.patch?rev=1.1&content-type=text/plain

Index: passenger-3.0.1-missing-include.patch
===================================================================
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>