Mercurial > packages > rhel6 > uwsgi
diff uwsgi-no-rpath.patch @ 4:851739edafa6
Update to version 1.9.21.1
| author | Guido Berhoerster <guido+packaging@berhoerster.name> |
|---|---|
| date | Wed, 18 Dec 2013 21:01:23 +0100 |
| parents | 8f3c148d4f0d |
| children |
line wrap: on
line diff
--- a/uwsgi-no-rpath.patch Mon Sep 09 19:21:35 2013 +0200 +++ b/uwsgi-no-rpath.patch Wed Dec 18 21:01:23 2013 +0100 @@ -1,20 +1,20 @@ -Index: uwsgi-1.9.15/plugins/php/uwsgiplugin.py +Index: uwsgi-1.9.21.1/plugins/php/uwsgiplugin.py =================================================================== ---- uwsgi-1.9.15.orig/plugins/php/uwsgiplugin.py -+++ uwsgi-1.9.15/plugins/php/uwsgiplugin.py -@@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --include - LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split() +--- uwsgi-1.9.21.1.orig/plugins/php/uwsgiplugin.py ++++ uwsgi-1.9.21.1/plugins/php/uwsgiplugin.py +@@ -17,7 +17,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags + if ld_run_path: LDFLAGS.append('-L%s' % ld_run_path) - os.environ['LD_RUN_PATH'] = ld_run_path LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5'] -Index: uwsgi-1.9.15/plugins/python/uwsgiplugin.py +Index: uwsgi-1.9.21.1/plugins/python/uwsgiplugin.py =================================================================== ---- uwsgi-1.9.15.orig/plugins/python/uwsgiplugin.py -+++ uwsgi-1.9.15/plugins/python/uwsgiplugin.py -@@ -44,10 +44,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro +--- uwsgi-1.9.21.1.orig/plugins/python/uwsgiplugin.py ++++ uwsgi-1.9.21.1/plugins/python/uwsgiplugin.py +@@ -52,10 +52,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro else: try: LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR')) @@ -25,10 +25,10 @@ LIBS.append('-lpython%s' % get_python_version()) else: -Index: uwsgi-1.9.15/plugins/rack/uwsgiplugin.py +Index: uwsgi-1.9.21.1/plugins/rack/uwsgiplugin.py =================================================================== ---- uwsgi-1.9.15.orig/plugins/rack/uwsgiplugin.py -+++ uwsgi-1.9.15/plugins/rack/uwsgiplugin.py +--- uwsgi-1.9.21.1.orig/plugins/rack/uwsgiplugin.py ++++ uwsgi-1.9.21.1/plugins/rack/uwsgiplugin.py @@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir if has_shared == 'yes': @@ -37,10 +37,10 @@ LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) else: rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip() -Index: uwsgi-1.9.15/plugins/ruby19/uwsgiplugin.py +Index: uwsgi-1.9.21.1/plugins/ruby19/uwsgiplugin.py =================================================================== ---- uwsgi-1.9.15.orig/plugins/ruby19/uwsgiplugin.py -+++ uwsgi-1.9.15/plugins/ruby19/uwsgiplugin.py +--- uwsgi-1.9.21.1.orig/plugins/ruby19/uwsgiplugin.py ++++ uwsgi-1.9.21.1/plugins/ruby19/uwsgiplugin.py @@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip() @@ -48,11 +48,11 @@ -os.environ['LD_RUN_PATH'] = libpath LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split() -Index: uwsgi-1.9.15/plugins/jvm/uwsgiplugin.py +Index: uwsgi-1.9.21.1/plugins/jvm/uwsgiplugin.py =================================================================== ---- uwsgi-1.9.15.orig/plugins/jvm/uwsgiplugin.py -+++ uwsgi-1.9.15/plugins/jvm/uwsgiplugin.py -@@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH: +--- uwsgi-1.9.21.1.orig/plugins/jvm/uwsgiplugin.py ++++ uwsgi-1.9.21.1/plugins/jvm/uwsgiplugin.py +@@ -65,11 +65,6 @@ if "-framework JavaVM" in JVM_LIBPATH: GCC_LIST = ['jvm_plugin']