| 1 |
graaff 09/06/24 09:35:38 |
| 2 |
|
| 3 |
Added: 2.2.4-gentoo.patch |
| 4 |
Removed: 2.2.3-gentoo.patch |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-apache/passenger/files/2.2.4-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/passenger/files/2.2.4-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/passenger/files/2.2.4-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 2.2.4-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
--- Rakefile.~1~ 2009-05-19 11:48:28.236986307 +0200 |
| 18 |
+++ Rakefile 2009-05-19 11:50:53.000000000 +0200 |
| 19 |
@@ -38,11 +38,7 @@ |
| 20 |
|
| 21 |
CXX = "g++" |
| 22 |
LIBEXT = PlatformInfo.library_extension |
| 23 |
-if OPTIMIZE |
| 24 |
- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS" |
| 25 |
-else |
| 26 |
- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS" |
| 27 |
-end |
| 28 |
+OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG" |
| 29 |
|
| 30 |
# Extra compiler flags that should always be passed to the C/C++ compiler. |
| 31 |
# Should be included last in the command string. |
| 32 |
@@ -733,15 +729,15 @@ |
| 33 |
task :fakeroot => [:apache2, :native_support, :doc] do |
| 34 |
require 'rbconfig' |
| 35 |
include Config |
| 36 |
- fakeroot = "pkg/fakeroot" |
| 37 |
+ fakeroot = ENV['DISTDIR'] |
| 38 |
|
| 39 |
# We don't use CONFIG['archdir'] and the like because we want |
| 40 |
# the files to be installed to /usr, and the Ruby interpreter |
| 41 |
# on the packaging machine might be in /usr/local. |
| 42 |
- libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}" |
| 43 |
+ libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}" |
| 44 |
extdir = "#{libdir}/#{CONFIG['arch']}" |
| 45 |
bindir = "#{fakeroot}/usr/bin" |
| 46 |
- docdir = "#{fakeroot}/usr/share/doc/phusion_passenger" |
| 47 |
+ docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}" |
| 48 |
libexecdir = "#{fakeroot}/usr/lib/phusion_passenger" |
| 49 |
|
| 50 |
sh "rm -rf #{fakeroot}" |
| 51 |
@@ -757,7 +753,6 @@ |
| 52 |
sh "cp bin/* #{bindir}/" |
| 53 |
|
| 54 |
sh "mkdir -p #{libexecdir}" |
| 55 |
- sh "cp ext/apache2/mod_passenger.so #{libexecdir}/" |
| 56 |
sh "mv #{fakeroot}/usr/bin/passenger-spawn-server #{libexecdir}/" |
| 57 |
sh "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/" |
Archives