| 1 |
graaff 10/11/02 14:40:57 |
| 2 |
|
| 3 |
Added: passenger-3.0.0-gentoo.patch |
| 4 |
Log: |
| 5 |
Version bump. Convert to ruby-ng. Dropped ~x86 due to new dependencies, bug 343849. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 www-apache/passenger/files/passenger-3.0.0-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/files/passenger-3.0.0-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/files/passenger-3.0.0-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: passenger-3.0.0-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
--- build/config.rb.~1~ 2010-10-01 12:22:34.000000000 +0200 |
| 17 |
+++ build/config.rb 2010-11-02 10:56:25.309314070 +0100 |
| 18 |
@@ -17,11 +17,7 @@ |
| 19 |
OPTIMIZE = boolean_option("OPTIMIZE") |
| 20 |
CC = string_option("CC", "gcc") |
| 21 |
CXX = string_option("CXX", "g++") |
| 22 |
-if OPTIMIZE |
| 23 |
- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip |
| 24 |
-else |
| 25 |
- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip |
| 26 |
-end |
| 27 |
+OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']}" |
| 28 |
|
| 29 |
# Extra compiler flags that should always be passed to the C/C++ compiler. |
| 30 |
# Should be included last in the command string, even after PlatformInfo.portability_cflags. |
| 31 |
--- build/packaging.rb.~1~ 2010-10-10 20:52:03.000000000 +0200 |
| 32 |
+++ build/packaging.rb 2010-11-02 11:03:56.944938507 +0100 |
| 33 |
@@ -87,13 +87,13 @@ |
| 34 |
require 'rbconfig' |
| 35 |
require 'fileutils' |
| 36 |
include Config |
| 37 |
- fakeroot = "pkg/fakeroot" |
| 38 |
+ fakeroot = ENV['DISTDIR'] |
| 39 |
|
| 40 |
# We don't use CONFIG['archdir'] and the like because we want |
| 41 |
# the files to be installed to /usr, and the Ruby interpreter |
| 42 |
# on the packaging machine might be in /usr/local. |
| 43 |
- fake_libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}" |
| 44 |
- fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}" |
| 45 |
+ fake_libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}" |
| 46 |
+ fake_native_support_dir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}/#{CONFIG['arch']}" |
| 47 |
fake_agents_dir = "#{fakeroot}#{NATIVELY_PACKAGED_AGENTS_DIR}" |
| 48 |
fake_helper_scripts_dir = "#{fakeroot}#{NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR}" |
| 49 |
fake_docdir = "#{fakeroot}#{NATIVELY_PACKAGED_DOCDIR}" |
Archives