| 1 |
hollow 08/06/01 11:04:28 |
| 2 |
|
| 3 |
Added: 1.0.5-gentoo.patch |
| 4 |
Log: |
| 5 |
version bump wrt #223003 |
| 6 |
(Portage version: 2.1.5.2) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 www-apache/passenger/files/1.0.5-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/passenger/files/1.0.5-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/passenger/files/1.0.5-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 1.0.5-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
diff -NurpP passenger-1.0.5.orig/Rakefile passenger-1.0.5/Rakefile |
| 17 |
--- passenger-1.0.5.orig/Rakefile 2008-05-07 18:27:24.000000000 +0000 |
| 18 |
+++ passenger-1.0.5/Rakefile 2008-06-01 10:57:04.860048239 +0000 |
| 19 |
@@ -37,7 +37,7 @@ APR_FLAGS.nil? and raise "Could not find |
| 20 |
|
| 21 |
CXX = "g++" |
| 22 |
THREADING_FLAGS = "-D_REENTRANT" |
| 23 |
-CXXFLAGS = "#{THREADING_FLAGS} -Wall -g -I/usr/local/include " << MULTI_ARCH_FLAGS |
| 24 |
+CXXFLAGS = "#{ENV['CXXFLAGS']} #{THREADING_FLAGS} -Wall" << MULTI_ARCH_FLAGS |
| 25 |
LDFLAGS = "" |
| 26 |
|
| 27 |
|
| 28 |
@@ -87,8 +87,7 @@ subdir 'ext/boost/src' do |
| 29 |
# processes, sometimes pthread errors will occur. These errors are harmless |
| 30 |
# and should be ignored. Defining NDEBUG guarantees that boost::thread() will |
| 31 |
# not abort if such an error occured. |
| 32 |
- flags = "-O2 -fPIC -I../.. #{THREADING_FLAGS} -DNDEBUG #{MULTI_ARCH_FLAGS}" |
| 33 |
- compile_cxx "*.cpp", flags |
| 34 |
+ compile_cxx "*.cpp", "#{CXXFLAGS} -fPIC -I../.. -DNDEBUG" |
| 35 |
create_static_library "libboost_thread.a", "*.o" |
| 36 |
end |
| 37 |
|
| 38 |
@@ -101,7 +100,7 @@ end |
| 39 |
##### Apache module |
| 40 |
|
| 41 |
class APACHE2 |
| 42 |
- CXXFLAGS = "-I.. -fPIC -g -DPASSENGER_DEBUG #{APR_FLAGS} #{APXS2_FLAGS} #{CXXFLAGS}" |
| 43 |
+ CXXFLAGS = "-I.. -fPIC #{APR_FLAGS} #{APXS2_FLAGS} #{CXXFLAGS}" |
| 44 |
OBJECTS = { |
| 45 |
'Configuration.o' => %w(Configuration.cpp Configuration.h), |
| 46 |
'Hooks.o' => %w(Hooks.cpp Hooks.h |
| 47 |
diff -NurpP passenger-1.0.5.orig/bin/passenger-spawn-server passenger-1.0.5/bin/passenger-spawn-server |
| 48 |
--- passenger-1.0.5.orig/bin/passenger-spawn-server 2008-04-03 15:49:06.000000000 +0000 |
| 49 |
+++ passenger-1.0.5/bin/passenger-spawn-server 2008-06-01 10:55:57.585311422 +0000 |
| 50 |
@@ -16,7 +16,6 @@ |
| 51 |
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
| 52 |
|
| 53 |
require 'pathname' |
| 54 |
-$LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib")) |
| 55 |
require 'passenger/spawn_manager' |
| 56 |
require 'passenger/utils' |
| 57 |
|
| 58 |
diff -NurpP passenger-1.0.5.orig/lib/passenger/platform_info.rb passenger-1.0.5/lib/passenger/platform_info.rb |
| 59 |
--- passenger-1.0.5.orig/lib/passenger/platform_info.rb 2008-04-28 21:34:04.000000000 +0000 |
| 60 |
+++ passenger-1.0.5/lib/passenger/platform_info.rb 2008-06-01 10:58:27.772399440 +0000 |
| 61 |
@@ -115,7 +115,6 @@ private |
| 62 |
else |
| 63 |
flags = `#{APXS2} -q CFLAGS`.strip << " -I" << `#{APXS2} -q INCLUDEDIR` |
| 64 |
flags.strip! |
| 65 |
- flags.gsub!(/-O\d? /, '') |
| 66 |
return flags |
| 67 |
end |
| 68 |
end |
| 69 |
@@ -151,7 +150,6 @@ private |
| 70 |
else |
| 71 |
flags = `#{APR_CONFIG} --cppflags --includes`.strip |
| 72 |
libs = `#{APR_CONFIG} --link-ld`.strip |
| 73 |
- flags.gsub!(/-O\d? /, '') |
| 74 |
return [flags, libs] |
| 75 |
end |
| 76 |
end |
| 77 |
diff -NurpP passenger-1.0.5.orig/lib/passenger/request_handler.rb passenger-1.0.5/lib/passenger/request_handler.rb |
| 78 |
--- passenger-1.0.5.orig/lib/passenger/request_handler.rb 2008-05-07 14:05:55.000000000 +0000 |
| 79 |
+++ passenger-1.0.5/lib/passenger/request_handler.rb 2008-06-01 10:55:57.585311422 +0000 |
| 80 |
@@ -102,7 +102,6 @@ class RequestHandler |
| 81 |
NINJA_PATCHING_LOCK = Mutex.new |
| 82 |
@@ninja_patched_action_controller = false |
| 83 |
|
| 84 |
- File.read("#{File.dirname(__FILE__)}/../../Rakefile") =~ /^PACKAGE_VERSION = "(.*)"$/ |
| 85 |
PASSENGER_VERSION = $1 |
| 86 |
PASSENGER_HEADER = "Phusion Passenger (mod_rails) #{PASSENGER_VERSION}" |
| 87 |
if File.exist?("#{File.dirname(__FILE__)}/../../enterprisey.txt") |
| 88 |
diff -NurpP passenger-1.0.5.orig/lib/passenger/utils.rb passenger-1.0.5/lib/passenger/utils.rb |
| 89 |
--- passenger-1.0.5.orig/lib/passenger/utils.rb 2008-05-07 18:26:59.000000000 +0000 |
| 90 |
+++ passenger-1.0.5/lib/passenger/utils.rb 2008-06-01 10:55:57.586311270 +0000 |
| 91 |
@@ -20,7 +20,7 @@ require 'etc' |
| 92 |
require 'thread' |
| 93 |
require 'fastthread' |
| 94 |
require 'timeout' |
| 95 |
-require File.expand_path("#{File.dirname(__FILE__)}/../../ext/passenger/native_support.so") |
| 96 |
+require 'native_support' |
| 97 |
|
| 98 |
module Passenger |
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
-- |
| 104 |
gentoo-commits@l.g.o mailing list |
Archives