[gentoo-commits] gentoo-x86 commit in www-apache/passenger/files: 2.2.15-gentoo-multilib-strict.patch

[Hans de Graaff (graaff)]

graaff      10/11/06 11:08:26

  Added:                2.2.15-gentoo-multilib-strict.patch
  Log:
  Fix installation on multlib-strict systems, thanks to robbat2 for the patch in bug 344225.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  www-apache/passenger/files/2.2.15-gentoo-multilib-strict.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/files/2.2.15-gentoo-multilib-strict.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/files/2.2.15-gentoo-multilib-strict.patch?rev=1.1&content-type=text/plain

Index: 2.2.15-gentoo-multilib-strict.patch
===================================================================
diff -Nuar passenger-2.2.15.orig/Rakefile passenger-2.2.15/Rakefile
--- passenger-2.2.15.orig/Rakefile	2010-11-05 03:19:02.000000000 +0000
+++ passenger-2.2.15/Rakefile	2010-11-05 03:23:45.000000000 +0000
@@ -744,7 +744,7 @@
 	extdir = "#{libdir}/#{CONFIG['arch']}"
 	bindir = "#{fakeroot}/usr/bin"
   docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}"
-	libexecdir = "#{fakeroot}/usr/lib/phusion_passenger"
+	libexecdir = "#{fakeroot}/usr/libexec/phusion_passenger"
 	
 	sh "rm -rf #{fakeroot}"
 	sh "mkdir -p #{fakeroot}"
diff -Nuar passenger-2.2.15.orig/ext/common/Utils.cpp passenger-2.2.15/ext/common/Utils.cpp
--- passenger-2.2.15.orig/ext/common/Utils.cpp	2010-06-24 11:53:02.000000000 +0000
+++ passenger-2.2.15/ext/common/Utils.cpp	2010-11-05 03:22:39.000000000 +0000
@@ -113,7 +113,7 @@
 			return path;
 		} else {
 			path.assign(root);
-			path.append("lib/phusion_passenger/passenger-spawn-server");
+			path.append("libexec/phusion_passenger/passenger-spawn-server");
 			return path;
 		}
 		return path;
@@ -152,7 +152,7 @@
 		return path;
 	} else {
 		path.assign(root);
-		path.append("lib/phusion_passenger/ApplicationPoolServerExecutable");
+		path.append("libexec/phusion_passenger/ApplicationPoolServerExecutable");
 		return path;
 	}
 }