← Back to branch summary

~ubuntu-branches/ubuntu/wily/ruby-passenger/wily-proposed

« back to all changes in this revision

Viewing changes to rpm/patches/passenger-force-native.patch

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2013-11-23 23:50:02 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20131123235002-8fdhsq7afj15o2z2
Tags: 4.0.25-1
http://bugs.debian.org/725591
* New upstream release.
* Refresh fix_install_path.patch.
* Build for Ruby 2.0 instead of 1.8. (Closes: #725591)
* Add fix_ftbfs_fortify_source.patch.
* Install passenger template files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
rpm/patches/passenger-force-native.patch
 
1
diff --git a/lib/phusion_passenger.rb b/lib/phusion_passenger.rb
 
2
index e747477..27e82f1 100644
 
3
--- a/lib/phusion_passenger.rb
 
4
+++ b/lib/phusion_passenger.rb
 
5
@@ -94,12 +94,12 @@ module PhusionPassenger
 
6
                # Not available when natively packaged.
 
7
                NATIVE_SUPPORT_DIR = File.join(SOURCE_ROOT, "ext", "ruby")
 
8
        else
 
9
-               SOURCE_ROOT        = NATIVELY_PACKAGED_SOURCE_ROOT
 
10
-               DOCDIR             = NATIVELY_PACKAGED_DOCDIR
 
11
-               RESOURCES_DIR      = NATIVELY_PACKAGED_RESOURCES_DIR
 
12
-               AGENTS_DIR         = NATIVELY_PACKAGED_AGENTS_DIR
 
13
-               HELPER_SCRIPTS_DIR = NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR
 
14
-               APACHE2_MODULE     = NATIVELY_PACKAGED_APACHE2_MODULE
 
15
+               SOURCE_ROOT        = '%%GEM_INSTALL_DIR%%'
 
16
+               DOCDIR             = "#{SOURCE_ROOT}/doc"
 
17
+               RESOURCES_DIR      = "#{SOURCE_ROOT}/resources"
 
18
+               HELPER_SCRIPTS_DIR = "#{SOURCE_ROOT}/helper-scripts"
 
19
+               APACHE2_MODULE     = '%%APACHE_INSTALLED_MOD%%'
 
20
+               NATIVE_SUPPORT_DIR = "#{SOURCE_ROOT}/ext/ruby"
 
21
        end
 
22
        
 
23
        
 
24
diff --git a/lib/phusion_passenger/native_support.rb b/lib/phusion_passenger/native_support.rb
 
25
index f1edf1c..4312d01 100644
 
26
--- a/lib/phusion_passenger/native_support.rb
 
27
+++ b/lib/phusion_passenger/native_support.rb
 
28
@@ -38,10 +38,7 @@ class NativeSupportLoader
 
29
 
 
30
 private
 
31
        def archdir
 
32
-               @archdir ||= begin
 
33
-                       require 'phusion_passenger/platform_info/binary_compatibility'
 
34
-                       PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
 
35
-               end
 
36
+               @archdir ||= 'native'
 
37
        end
 
38
        
 
39
        def libext
 
40
diff --git a/ext/common/ResourceLocator.h b/ext/common/ResourceLocator.h
 
41
index 5f65804..e585d1a 100644
 
42
--- a/ext/common/ResourceLocator.h
 
43
+++ b/ext/common/ResourceLocator.h
 
44
@@ -64,13 +64,13 @@ public:
 
45
                                !fileExists(root + "/DEVELOPERS.TXT");
 
46
                        
 
47
                        if (nativelyPackaged) {
 
48
-                               agentsDir           = "/usr/lib/phusion-passenger/agents";
 
49
-                               helperScriptsDir    = "/usr/share/phusion-passenger/helper-scripts";
 
50
-                               resourcesDir        = "/usr/share/phusion-passenger";
 
51
-                               docDir              = "/usr/share/doc/phusion-passenger";
 
52
+                               agentsDir           = "%%GEM_INSTALL_DIR%%/agents";
 
53
+                               helperScriptsDir    = "%%GEM_INSTALL_DIR%%/helper-scripts";
 
54
+                               resourcesDir        = "%%GEM_INSTALL_DIR%%";
 
55
+                               docDir              = "%%GEM_INSTALL_DIR%%/doc";
 
56
                                rubyLibDir          = "";
 
57
-                               compilableSourceDir = "/usr/share/phusion-passenger/compilable-source";
 
58
-                               apache2Module       = "/usr/lib/apache2/modules/mod_passenger.so";
 
59
+                               compilableSourceDir = "%%GEM_INSTALL_DIR%%";
 
60
+                               apache2Module       = "%%APACHE_INSTALLED_MOD%%";
 
61
                        } else {
 
62
                                agentsDir           = root + "/agents";
 
63
                                helperScriptsDir    = root + "/helper-scripts";