diff options
| author |   Alex Legler <a3li@gentoo.org> | 2009-03-15 14:36:08 +0000 |
|---|---|---|
| committer | Alex Legler <a3li@gentoo.org> | 2009-03-15 14:36:08 +0000 |
| commit | 8c13933ce7a9d2d65427eea0794e57192f4493dc (patch) | |
| tree | 5ee6c8ec6509b50ee89228d7b75aaffbba74f773 /www-apache/passenger/files | |
| parent | Automatic-merge: merge updates for 4.2.1 from kde-testing. (diff) | |
| download | gentoo-2-8c13933ce7a9d2d65427eea0794e57192f4493dc.tar.gz gentoo-2-8c13933ce7a9d2d65427eea0794e57192f4493dc.tar.bz2 gentoo-2-8c13933ce7a9d2d65427eea0794e57192f4493dc.zip | |
Version bump
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'www-apache/passenger/files')
| -rw-r--r-- | www-apache/passenger/files/2.1.2-gentoo.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/www-apache/passenger/files/2.1.2-gentoo.patch b/www-apache/passenger/files/2.1.2-gentoo.patch new file mode 100644 index 000000000000..deec17a62620 --- /dev/null +++ b/www-apache/passenger/files/2.1.2-gentoo.patch @@ -0,0 +1,44 @@ +--- Rakefile.orig 2009-03-15 15:15:44.000000000 +0100 ++++ Rakefile 2009-03-15 15:24:51.000000000 +0100 +@@ -39,12 +39,8 @@ + CXX = "g++" + LIBEXT = PlatformInfo.library_extension + # _GLIBCPP__PTHREADS is for fixing Boost compilation on OpenBSD. +-if OPTIMIZE +- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS" +-else +- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS" +-end +-CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}" ++OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG" ++CXXFLAGS = "#{OPTIMIZATION_FLAGS} -Wall" + EXTRA_LDFLAGS = "" + + #### Default tasks +@@ -540,15 +536,15 @@ + task :fakeroot => [:apache2, :native_support, :doc] do + require 'rbconfig' + include Config +- fakeroot = "pkg/fakeroot" ++ fakeroot = ENV['DISTDIR'] + + # We don't use CONFIG['archdir'] and the like because we want + # the files to be installed to /usr, and the Ruby interpreter + # on the packaging machine might be in /usr/local. +- libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}" ++ libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}" + extdir = "#{libdir}/#{CONFIG['arch']}" + bindir = "#{fakeroot}/usr/bin" +- docdir = "#{fakeroot}/usr/share/doc/phusion_passenger" ++ docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}" + libexecdir = "#{fakeroot}/usr/lib/phusion_passenger" + + sh "rm -rf #{fakeroot}" +@@ -567,7 +563,6 @@ + sh "cp bin/* #{bindir}/" + + sh "mkdir -p #{libexecdir}" +- sh "cp ext/apache2/mod_passenger.so #{libexecdir}/" + sh "mv #{fakeroot}/usr/bin/passenger-spawn-server #{libexecdir}/" + sh "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/" + |