57 lines
2.3 KiB
Diff
57 lines
2.3 KiB
Diff
|
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']
|
||
|
|
|
||
|
|
-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']
|
||
|
|
|
||
|
|
-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
|
||
|
|
@@ -20,10 +20,8 @@
|
||
|
|
else:
|
||
|
|
try:
|
||
|
|
LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
|
||
|
|
- os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR'))
|
||
|
|
except:
|
||
|
|
LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX)
|
||
|
|
- os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX
|
||
|
|
|
||
|
|
|
||
|
|
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
|
||
|
|
@@ -38,6 +38,5 @@
|
||
|
|
|
||
|
|
libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
|
||
|
|
LDFLAGS.append('-L' + libpath )
|
||
|
|
-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
|
||
|
|
@@ -40,6 +40,5 @@
|
||
|
|
|
||
|
|
libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
|
||
|
|
LDFLAGS.append('-L' + libpath )
|
||
|
|
-os.environ['LD_RUN_PATH'] = libpath
|
||
|
|
LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split()
|
||
|
|
|