view uwsgi-no-rpath.patch @ 12:d0948dcc1656 default tip

Update to version 2.0.8
author Guido Berhoerster <guido+packaging@berhoerster.name>
date Thu, 30 Oct 2014 10:15:36 +0100
parents 851739edafa6
children
line wrap: on
line source

Index: uwsgi-1.9.21.1/plugins/php/uwsgiplugin.py
===================================================================
--- 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.21.1/plugins/python/uwsgiplugin.py
===================================================================
--- 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'))
-            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.21.1/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':
     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:
     rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip()
Index: uwsgi-1.9.21.1/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()
 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.21.1/plugins/jvm/uwsgiplugin.py
===================================================================
--- 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']
 
-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)