diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2013-10-05 13:29:23 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2013-10-05 13:29:23 +0000 |
| commit | 1ab8f8fc2d895b8010809fa38adbfe245d2852f2 (patch) | |
| tree | cc8662fac122781278c3791c24cac56845d3dfa6 /www-apache/passenger/files | |
| parent | Stable for HPPA (bug #486326). (diff) | |
| download | gentoo-2-1ab8f8fc2d895b8010809fa38adbfe245d2852f2.tar.gz gentoo-2-1ab8f8fc2d895b8010809fa38adbfe245d2852f2.tar.bz2 gentoo-2-1ab8f8fc2d895b8010809fa38adbfe245d2852f2.zip | |
Version bump.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'www-apache/passenger/files')
| -rw-r--r-- | www-apache/passenger/files/passenger-4.0.18-gentoo.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/www-apache/passenger/files/passenger-4.0.18-gentoo.patch b/www-apache/passenger/files/passenger-4.0.18-gentoo.patch new file mode 100644 index 000000000000..7eb7c3392062 --- /dev/null +++ b/www-apache/passenger/files/passenger-4.0.18-gentoo.patch @@ -0,0 +1,39 @@ +--- build/packaging.rb.~1~ 2013-09-14 10:09:56.000000000 +0200 ++++ build/packaging.rb 2013-10-05 15:03:51.474846961 +0200 +@@ -306,14 +306,14 @@ + require 'rbconfig' + require 'fileutils' + include RbConfig +- 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. +- fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby" ++ fake_rubylibdir = "#{fakeroot}#{CONFIG['vendordir']}" + fake_libdir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}" +- fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}" ++ fake_native_support_dir = "#{fakeroot}#{CONFIG['archdir']}" + fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents" + fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts" + fake_resources_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}" +@@ -326,7 +326,6 @@ + fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source" + fake_nginx_module_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module" + +- sh "rm -rf #{fakeroot}" + sh "mkdir -p #{fakeroot}" + + # Ruby sources +@@ -405,10 +404,6 @@ + end + end + +- # Apache 2 module +- sh "mkdir -p #{fake_apache2_module_dir}" +- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/" +- + # Ruby extension sources + sh "mkdir -p #{fake_ruby_extension_source_dir}" + sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}" |