Mercurial > packages > rhel6 > uwsgi
diff uwsgi-no-rpath.patch @ 3:8f3c148d4f0d
Update to version 1.9.15
| author | Guido Berhoerster <guido+packaging@berhoerster.name> |
|---|---|
| date | Mon, 09 Sep 2013 19:21:35 +0200 |
| parents | 9668c317e887 |
| children | 851739edafa6 |
line wrap: on
line diff
--- a/uwsgi-no-rpath.patch Sat Jul 27 13:52:48 2013 +0200 +++ b/uwsgi-no-rpath.patch Mon Sep 09 19:21:35 2013 +0200 @@ -1,7 +1,7 @@ -Index: uwsgi-1.9.13/plugins/php/uwsgiplugin.py +Index: uwsgi-1.9.15/plugins/php/uwsgiplugin.py =================================================================== ---- uwsgi-1.9.13.orig/plugins/php/uwsgiplugin.py -+++ uwsgi-1.9.13/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() if ld_run_path: @@ -10,10 +10,10 @@ LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5'] -Index: uwsgi-1.9.13/plugins/python/uwsgiplugin.py +Index: uwsgi-1.9.15/plugins/python/uwsgiplugin.py =================================================================== ---- uwsgi-1.9.13.orig/plugins/python/uwsgiplugin.py -+++ uwsgi-1.9.13/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 else: try: @@ -25,10 +25,10 @@ LIBS.append('-lpython%s' % get_python_version()) else: -Index: uwsgi-1.9.13/plugins/rack/uwsgiplugin.py +Index: uwsgi-1.9.15/plugins/rack/uwsgiplugin.py =================================================================== ---- uwsgi-1.9.13.orig/plugins/rack/uwsgiplugin.py -+++ uwsgi-1.9.13/plugins/rack/uwsgiplugin.py +--- uwsgi-1.9.15.orig/plugins/rack/uwsgiplugin.py ++++ uwsgi-1.9.15/plugins/rack/uwsgiplugin.py @@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir if has_shared == 'yes': @@ -36,11 +36,11 @@ - os.environ['LD_RUN_PATH'] = libpath LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) else: - GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip())) -Index: uwsgi-1.9.13/plugins/ruby19/uwsgiplugin.py + rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip() +Index: uwsgi-1.9.15/plugins/ruby19/uwsgiplugin.py =================================================================== ---- uwsgi-1.9.13.orig/plugins/ruby19/uwsgiplugin.py -+++ uwsgi-1.9.13/plugins/ruby19/uwsgiplugin.py +--- uwsgi-1.9.15.orig/plugins/ruby19/uwsgiplugin.py ++++ uwsgi-1.9.15/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,10 +48,10 @@ -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.13/plugins/jvm/uwsgiplugin.py +Index: uwsgi-1.9.15/plugins/jvm/uwsgiplugin.py =================================================================== ---- uwsgi-1.9.13.orig/plugins/jvm/uwsgiplugin.py -+++ uwsgi-1.9.13/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: GCC_LIST = ['jvm_plugin']