rpms
/
uwsgi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed offset for this patch too

This commit is contained in:
Jorge A Gallegos 2012-06-26 23:50:28 -07:00
parent df417c201c
commit 88f416116c
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
uwsgi_fix_rpath.patch
View File

@ -1,28 +1,17 @@
diff -r 2c851ba9ddd6 plugins/jvm/uwsgiplugin.py
--- a/plugins/jvm/uwsgiplugin.py Wed Jan 18 05:01:22 2012 +0100
+++ b/plugins/jvm/uwsgiplugin.py Mon Jan 23 08:50:13 2012 -0800
@@ -41,7 +41,3 @@
LIBS = ['-ljvm']
GCC_LIST = ['jvm_plugin']
diff -r 655aa0eeb778 plugins/php/uwsgiplugin.py
--- a/plugins/php/uwsgiplugin.py Tue Jun 26 07:59:35 2012 +0200
+++ b/plugins/php/uwsgiplugin.py Tue Jun 26 23:47:16 2012 -0700
@@ -22,7 +22,6 @@
LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
if ld_run_path:
LDFLAGS.append('-L%s' % ld_run_path)
- os.environ['LD_RUN_PATH'] = ld_run_path
-if os.environ.has_key('LD_RUN_PATH'):
- os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH
-else:
- os.environ['LD_RUN_PATH'] = JVM_LIBPATH
diff -r 2c851ba9ddd6 plugins/jwsgi/uwsgiplugin.py
--- a/plugins/jwsgi/uwsgiplugin.py Wed Jan 18 05:01:22 2012 +0100
+++ b/plugins/jwsgi/uwsgiplugin.py Mon Jan 23 08:50:13 2012 -0800
@@ -16,7 +16,3 @@
LIBS = ['-ljvm']
GCC_LIST = ['jwsgi_plugin']
LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
-if os.environ.has_key('LD_RUN_PATH'):
- os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH
-else:
- os.environ['LD_RUN_PATH'] = JVM_LIBPATH
diff -r 2c851ba9ddd6 plugins/python/uwsgiplugin.py
--- a/plugins/python/uwsgiplugin.py Wed Jan 18 05:01:22 2012 +0100
+++ b/plugins/python/uwsgiplugin.py Mon Jan 23 08:50:13 2012 -0800
diff -r 655aa0eeb778 plugins/python/uwsgiplugin.py
--- a/plugins/python/uwsgiplugin.py Tue Jun 26 07:59:35 2012 +0200
+++ b/plugins/python/uwsgiplugin.py Tue Jun 26 23:47:16 2012 -0700
@@ -20,10 +20,8 @@
else:
try:
@ -34,9 +23,9 @@ diff -r 2c851ba9ddd6 plugins/python/uwsgiplugin.py
version = sysconfig.get_config_var('VERSION')
diff -r 2c851ba9ddd6 plugins/rack/uwsgiplugin.py
--- a/plugins/rack/uwsgiplugin.py Wed Jan 18 05:01:22 2012 +0100
+++ b/plugins/rack/uwsgiplugin.py Mon Jan 23 08:50:13 2012 -0800
diff -r 655aa0eeb778 plugins/rack/uwsgiplugin.py
--- a/plugins/rack/uwsgiplugin.py Tue Jun 26 07:59:35 2012 +0200
+++ b/plugins/rack/uwsgiplugin.py Tue Jun 26 23:47:16 2012 -0700
@@ -38,6 +38,5 @@
libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
@ -44,9 +33,9 @@ diff -r 2c851ba9ddd6 plugins/rack/uwsgiplugin.py
-os.environ['LD_RUN_PATH'] = libpath
LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split()
diff -r 2c851ba9ddd6 plugins/ruby19/uwsgiplugin.py
--- a/plugins/ruby19/uwsgiplugin.py Wed Jan 18 05:01:22 2012 +0100
+++ b/plugins/ruby19/uwsgiplugin.py Mon Jan 23 08:50:13 2012 -0800
diff -r 655aa0eeb778 plugins/ruby19/uwsgiplugin.py
--- a/plugins/ruby19/uwsgiplugin.py Tue Jun 26 07:59:35 2012 +0200
+++ b/plugins/ruby19/uwsgiplugin.py Tue Jun 26 23:47:16 2012 -0700
@@ -40,6 +40,5 @@
libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()