From: "Tiziano Mueller (dev-zero)" <dev-zero@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [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
Date: Mon, 13 Dec 2010 10:38:57 +0000 (UTC) [thread overview]
Message-ID: <20101213103857.7245F20054@flycatcher.gentoo.org> (raw)
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>
reply other threads:[~2010-12-13 10:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101213103857.7245F20054@flycatcher.gentoo.org \
--to=dev-zero@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox