Attachment 898709 Details for Bug 1100840 – removes hard coded native lib path

[patch] removes hard coded native lib path

0001-Don-t-hard-code-native-lib-path-use-gem-s-load_path-.patch (text/plain), 1.93 KB, created by Dominic Cleal on 2014-05-23 14:49:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominic Cleal

Created: 2014-05-23 14:49:29 UTC

Size: 1.93 KB

patch

obsolete

>From 76c2eb7836c75a56700c5454c0488f0ca962e055 Mon Sep 17 00:00:00 2001
>From: Dominic Cleal <dcleal@redhat.com>
>Date: Fri, 23 May 2014 15:44:37 +0100
>Subject: [PATCH] Don't hard code native lib path, use gem's load_path for
> multiple Ruby support
>
>---
> locations.ini                             | 2 +-
> rubygem-passenger-4.0.18_native_dir.patch | 2 +-
> rubygem-passenger40.spec                  | 5 +++++
> 3 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/locations.ini b/locations.ini
>index bb51b3c..818a360 100644
>--- a/locations.ini
>+++ b/locations.ini
>@@ -5,7 +5,7 @@ agents_dir=@GEM_EXTDIR@/agents
> helper_scripts_dir=@GEM_INSTDIR@/helper-scripts
> resources_dir=@GEM_INSTDIR@/resources
> doc_dir=@GEM_DOCDIR@
>-ruby_libdir=@GEM_INSTDIR@/..
>+ruby_libdir=@GEM_INSTDIR@/lib
> lib_dir=@GEM_INSTDIR@/lib
> include_dir=@GEM_INSTDIR@/include
> apache2_module_path=@HTTPD_MODDIR@
>diff --git a/rubygem-passenger-4.0.18_native_dir.patch b/rubygem-passenger-4.0.18_native_dir.patch
>index 6354249..c9752fd 100644
>--- a/rubygem-passenger-4.0.18_native_dir.patch
>+++ b/rubygem-passenger-4.0.18_native_dir.patch
>@@ -7,7 +7,7 @@ index 994c379..d2b84fc 100644
>  	
>  	def load_from_load_path
> -		require 'passenger_native_support'
>-+		require "%%NATIVE_SUPPORT_DIR%%/native/#{library_name}"
>++		require 'native/passenger_native_support'
>  		return true
>  	rescue LoadError
>  		return false
>diff --git a/rubygem-passenger40.spec b/rubygem-passenger40.spec
>index 3acacbb..2ccb3d1 100644
>--- a/rubygem-passenger40.spec
>+++ b/rubygem-passenger40.spec
>@@ -382,6 +382,11 @@ for script in `find %{buildroot} -type f -name "*.rb" -o -name "*.cgi" -o -name
>     sed -i 's|#!/usr/bin/ruby|#!%{_bindir}/ruby|' $script
> done
> 
>+# Patch gemspec to indicate we have extensions, so Fedora's patched rubygems
>+# will add the 'exts' load path
>+sed -i '/Gem::Specification.new/ a s.extensions = ["workaround"]' \
>+    %{buildroot}%{gem_spec}
>+
> %check
> %if 0%{?scl:1}
> . /opt/rh/httpd24/enable
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1100840: 898709