Attachment 103685 Details for Bug 143661 – rubygem-passenger.diff

[patch] rubygem-passenger.diff

rubygem-passenger.diff (text/plain; charset=US-ASCII), 1.47 KB, created by Jyun-Yan You on 2010-02-19 07:24:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jyun-Yan You

Created: 2010-02-19 07:24:00 UTC

Size: 1.47 KB

patch

obsolete

>diff -ruN rubygem-passenger.orig/Makefile rubygem-passenger/Makefile
>--- rubygem-passenger.orig/Makefile	2010-02-19 14:36:48.328206837 +0800
>+++ rubygem-passenger/Makefile	2010-02-19 14:46:07.656394724 +0800
>@@ -66,6 +66,7 @@
> 	${REINPLACE_CMD} '377s!-g!${CXXFLAGS}!; \
> 		s!-lpthread!${PTHREAD_LIBS}!g' \
> 		${PREFIX}/${GEM_LIB_DIR}/lib/phusion_passenger/platform_info.rb
>+	${PATCH} -p0 -d ${PREFIX}/${GEM_LIB_DIR} < ${PATCHDIR}/platform_info.rb.patch
> 
> .if !defined(WITHOUT_APACHEPORT)
> 	(${PREFIX}/bin/passenger-install-apache2-module --auto)
>@@ -80,5 +81,6 @@
> 
> 	${FIND} ${PREFIX}/${GEM_LIB_DIR} -name '*.o' -delete
> 	${FIND} ${PREFIX}/${GEM_LIB_DIR} -name '*.bak' -delete
>+	${FIND} ${PREFIX}/${GEM_LIB_DIR} -name "*.orig" -delete
> 
> .include <bsd.port.mk>
>diff -ruN rubygem-passenger.orig/files/platform_info.rb.patch rubygem-passenger/files/platform_info.rb.patch
>--- rubygem-passenger.orig/files/platform_info.rb.patch	1970-01-01 08:00:00.000000000 +0800
>+++ rubygem-passenger/files/platform_info.rb.patch	2010-02-19 14:51:02.346540092 +0800
>@@ -0,0 +1,11 @@
>+--- lib/phusion_passenger/platform_info.rb.orig	2010-02-19 14:44:56.109603794 +0800
>++++ lib/phusion_passenger/platform_info.rb	2010-02-19 14:44:09.624186915 +0800
>+@@ -203,7 +203,7 @@
>+ 	# belongs to the current Ruby interpreter. Returns nil if it
>+ 	# doesn't exist.
>+ 	def self.rake
>+-		return locate_ruby_executable('rake')
>++		return (locate_ruby_executable('rake') || locate_ruby_executable('rake19'))
>+ 	end
>+ 	memoize :rake
>+

Actions: View | Diff

Attachments on bug 143661: 103684 | 103685 | 103686