Mercurial > packages > rhel6 > uwsgi
diff uwsgi-no-rpath.patch @ 0:9668c317e887
Initial revision
author | Guido Berhoerster <guido+packaging@berhoerster.name> |
---|---|
date | Wed, 10 Jul 2013 19:23:16 +0200 |
parents | |
children | 8f3c148d4f0d |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/uwsgi-no-rpath.patch Wed Jul 10 19:23:16 2013 +0200 @@ -0,0 +1,66 @@ +Index: uwsgi-1.9.13/plugins/php/uwsgiplugin.py +=================================================================== +--- uwsgi-1.9.13.orig/plugins/php/uwsgiplugin.py ++++ uwsgi-1.9.13/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: + 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.13/plugins/python/uwsgiplugin.py +=================================================================== +--- uwsgi-1.9.13.orig/plugins/python/uwsgiplugin.py ++++ uwsgi-1.9.13/plugins/python/uwsgiplugin.py +@@ -44,10 +44,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro + 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 + + LIBS.append('-lpython%s' % get_python_version()) + else: +Index: uwsgi-1.9.13/plugins/rack/uwsgiplugin.py +=================================================================== +--- uwsgi-1.9.13.orig/plugins/rack/uwsgiplugin.py ++++ uwsgi-1.9.13/plugins/rack/uwsgiplugin.py +@@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir + + if has_shared == 'yes': + LDFLAGS.append('-L' + 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()) + 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 +=================================================================== +--- uwsgi-1.9.13.orig/plugins/ruby19/uwsgiplugin.py ++++ uwsgi-1.9.13/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() + 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() + +Index: uwsgi-1.9.13/plugins/jvm/uwsgiplugin.py +=================================================================== +--- uwsgi-1.9.13.orig/plugins/jvm/uwsgiplugin.py ++++ uwsgi-1.9.13/plugins/jvm/uwsgiplugin.py +@@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH: + + GCC_LIST = ['jvm_plugin'] + +-if 'LD_RUN_PATH' in os.environ: +- os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:] +-else: +- os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:] +- + def post_build(config): + if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0: + os._exit(1)