Updated patches to match 1.9.17 tree
This commit is contained in:
parent
95cd197ed0
commit
8b81de498a
|
@ -1,25 +1,31 @@
|
||||||
diff --git a/plugins/lua/uwsgiplugin.py b/plugins/lua/uwsgiplugin.py
|
diff --git a/plugins/lua/uwsgiplugin.py b/plugins/lua/uwsgiplugin.py
|
||||||
index ea12926..9b13f4d 100644
|
index 8aaa95b..d0e3cd0 100644
|
||||||
--- a/plugins/lua/uwsgiplugin.py
|
--- a/plugins/lua/uwsgiplugin.py
|
||||||
+++ b/plugins/lua/uwsgiplugin.py
|
+++ b/plugins/lua/uwsgiplugin.py
|
||||||
@@ -3,17 +3,17 @@ import os,sys
|
@@ -3,7 +3,7 @@ import os,sys
|
||||||
try:
|
LUAINC = os.environ.get('UWSGICONFIG_LUAINC')
|
||||||
LUALIB = os.environ['UWSGICONFIG_LUALIB']
|
LUALIB = os.environ.get('UWSGICONFIG_LUALIB')
|
||||||
except:
|
LUALIBPATH = os.environ.get('UWSGICONFIG_LUALIBPATH')
|
||||||
- LUALIB = 'lua5.1'
|
-LUAPC = os.environ.get('UWSGICONFIG_LUAPC', 'lua5.1')
|
||||||
+ LUALIB = 'lua'
|
+LUAPC = os.environ.get('UWSGICONFIG_LUAPC', 'lua')
|
||||||
|
|
||||||
try:
|
# we LUAINC/LUALIB/LUALIBPATH override the LUAPC for backwards compat
|
||||||
LUAINC = os.environ['UWSGICONFIG_LUAINC']
|
if LUAINC:
|
||||||
except:
|
@@ -12,7 +12,7 @@ else:
|
||||||
- LUAINC = '/usr/include/lua5.1'
|
try:
|
||||||
+ LUAINC = '/usr/include'
|
CFLAGS = os.popen('pkg-config --cflags %s' % LUAPC).read().rstrip().split()
|
||||||
|
except:
|
||||||
|
- CFLAGS = ['-I/usr/include/lua5.1']
|
||||||
|
+ CFLAGS = ['-I/usr/include/lua']
|
||||||
|
|
||||||
try:
|
if LUALIB:
|
||||||
LUALIBPATH = os.environ['UWSGICONFIG_LUALIBPATH']
|
LIBS = ['-l%s' % LUALIB]
|
||||||
except:
|
@@ -20,7 +20,7 @@ else:
|
||||||
- LUALIBPATH = '/usr/lib/lua5.1'
|
try:
|
||||||
+ LUALIBPATH = '/usr/lib/lua/5.1'
|
LIBS = os.popen('pkg-config --libs %s' % LUAPC).read().rstrip().split()
|
||||||
|
except:
|
||||||
|
- LIBS = ['-llua5.1']
|
||||||
|
+ LIBS = ['-llua']
|
||||||
|
|
||||||
NAME='lua'
|
if LUALIBPATH:
|
||||||
CFLAGS = ['-I%s' % LUAINC]
|
LDFLAGS = ['-L%s' % LUALIBPATH]
|
||||||
|
|
|
@ -15,11 +15,11 @@ index ac7eb3e..0911288 100644
|
||||||
if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
|
if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
|
||||||
os._exit(1)
|
os._exit(1)
|
||||||
diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py
|
diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py
|
||||||
index fb9e5bb..fd12c91 100644
|
index 4142aea..774d6bb 100644
|
||||||
--- a/plugins/php/uwsgiplugin.py
|
--- a/plugins/php/uwsgiplugin.py
|
||||||
+++ b/plugins/php/uwsgiplugin.py
|
+++ b/plugins/php/uwsgiplugin.py
|
||||||
@@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-error=sign-co
|
@@ -17,7 +17,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
|
||||||
LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
|
|
||||||
if ld_run_path:
|
if ld_run_path:
|
||||||
LDFLAGS.append('-L%s' % ld_run_path)
|
LDFLAGS.append('-L%s' % ld_run_path)
|
||||||
- os.environ['LD_RUN_PATH'] = ld_run_path
|
- os.environ['LD_RUN_PATH'] = ld_run_path
|
||||||
|
@ -27,10 +27,10 @@ index fb9e5bb..fd12c91 100644
|
||||||
LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
|
LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
|
||||||
|
|
||||||
diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py
|
diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py
|
||||||
index c4f03e1..8d4b2e0 100644
|
index 13c29cd..8bc464c 100644
|
||||||
--- a/plugins/python/uwsgiplugin.py
|
--- a/plugins/python/uwsgiplugin.py
|
||||||
+++ b/plugins/python/uwsgiplugin.py
|
+++ b/plugins/python/uwsgiplugin.py
|
||||||
@@ -45,10 +45,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ:
|
@@ -44,10 +44,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ:
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
|
LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
|
||||||
|
@ -42,7 +42,7 @@ index c4f03e1..8d4b2e0 100644
|
||||||
LIBS.append('-lpython%s' % get_python_version())
|
LIBS.append('-lpython%s' % get_python_version())
|
||||||
else:
|
else:
|
||||||
diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py
|
diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py
|
||||||
index 8dee214..2375bc9 100644
|
index 3d8ee83..45dc5e3 100644
|
||||||
--- a/plugins/rack/uwsgiplugin.py
|
--- a/plugins/rack/uwsgiplugin.py
|
||||||
+++ b/plugins/rack/uwsgiplugin.py
|
+++ b/plugins/rack/uwsgiplugin.py
|
||||||
@@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBS']\""
|
@@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBS']\""
|
||||||
|
@ -52,7 +52,7 @@ index 8dee214..2375bc9 100644
|
||||||
- os.environ['LD_RUN_PATH'] = libpath
|
- os.environ['LD_RUN_PATH'] = libpath
|
||||||
LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
|
LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
|
||||||
else:
|
else:
|
||||||
GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip()))
|
rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip()
|
||||||
diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py
|
diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py
|
||||||
index ecea48d..4f35984 100644
|
index ecea48d..4f35984 100644
|
||||||
--- a/plugins/ruby19/uwsgiplugin.py
|
--- a/plugins/ruby19/uwsgiplugin.py
|
||||||
|
|
Loading…
Reference in New Issue