Mercurial > packages > rhel6 > uwsgi

comparison uwsgi-no-rpath.patch @ 4:851739edafa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3:8f3c148d4f0d 4:851739edafa6
1 Index: uwsgi-1.9.15/plugins/php/uwsgiplugin.py 1 Index: uwsgi-1.9.21.1/plugins/php/uwsgiplugin.py
2 =================================================================== 2 ===================================================================
3 --- uwsgi-1.9.15.orig/plugins/php/uwsgiplugin.py 3 --- uwsgi-1.9.21.1.orig/plugins/php/uwsgiplugin.py
4 +++ uwsgi-1.9.15/plugins/php/uwsgiplugin.py 4 +++ uwsgi-1.9.21.1/plugins/php/uwsgiplugin.py
5 @@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --include 5 @@ -17,7 +17,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags
6 LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split() 6
7 if ld_run_path: 7 if ld_run_path:
8 LDFLAGS.append('-L%s' % ld_run_path) 8 LDFLAGS.append('-L%s' % ld_run_path)
9 - os.environ['LD_RUN_PATH'] = ld_run_path 9 - os.environ['LD_RUN_PATH'] = ld_run_path
10 10
11 LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5'] 11 LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
12 12
13 Index: uwsgi-1.9.15/plugins/python/uwsgiplugin.py 13 Index: uwsgi-1.9.21.1/plugins/python/uwsgiplugin.py
14 =================================================================== 14 ===================================================================
15 --- uwsgi-1.9.15.orig/plugins/python/uwsgiplugin.py 15 --- uwsgi-1.9.21.1.orig/plugins/python/uwsgiplugin.py
16 +++ uwsgi-1.9.15/plugins/python/uwsgiplugin.py 16 +++ uwsgi-1.9.21.1/plugins/python/uwsgiplugin.py
17 @@ -44,10 +44,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro 17 @@ -52,10 +52,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro
18 else: 18 else:
19 try: 19 try:
20 LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR')) 20 LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
21 - os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR')) 21 - os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR'))
22 except: 22 except:
23 LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX) 23 LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX)
24 - os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX 24 - os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX
25 25
26 LIBS.append('-lpython%s' % get_python_version()) 26 LIBS.append('-lpython%s' % get_python_version())
27 else: 27 else:
28 Index: uwsgi-1.9.15/plugins/rack/uwsgiplugin.py 28 Index: uwsgi-1.9.21.1/plugins/rack/uwsgiplugin.py
29 =================================================================== 29 ===================================================================
30 --- uwsgi-1.9.15.orig/plugins/rack/uwsgiplugin.py 30 --- uwsgi-1.9.21.1.orig/plugins/rack/uwsgiplugin.py
31 +++ uwsgi-1.9.15/plugins/rack/uwsgiplugin.py 31 +++ uwsgi-1.9.21.1/plugins/rack/uwsgiplugin.py
32 @@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir 32 @@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir
33 33
34 if has_shared == 'yes': 34 if has_shared == 'yes':
35 LDFLAGS.append('-L' + libpath ) 35 LDFLAGS.append('-L' + libpath )
36 - os.environ['LD_RUN_PATH'] = libpath 36 - os.environ['LD_RUN_PATH'] = libpath
37 LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) 37 LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
38 else: 38 else:
39 rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip() 39 rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip()
40 Index: uwsgi-1.9.15/plugins/ruby19/uwsgiplugin.py 40 Index: uwsgi-1.9.21.1/plugins/ruby19/uwsgiplugin.py
41 =================================================================== 41 ===================================================================
42 --- uwsgi-1.9.15.orig/plugins/ruby19/uwsgiplugin.py 42 --- uwsgi-1.9.21.1.orig/plugins/ruby19/uwsgiplugin.py
43 +++ uwsgi-1.9.15/plugins/ruby19/uwsgiplugin.py 43 +++ uwsgi-1.9.21.1/plugins/ruby19/uwsgiplugin.py
44 @@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req 44 @@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req
45 45
46 libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip() 46 libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
47 LDFLAGS.append('-L' + libpath ) 47 LDFLAGS.append('-L' + libpath )
48 -os.environ['LD_RUN_PATH'] = libpath 48 -os.environ['LD_RUN_PATH'] = libpath
49 LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split() 49 LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split()
50 50
51 Index: uwsgi-1.9.15/plugins/jvm/uwsgiplugin.py 51 Index: uwsgi-1.9.21.1/plugins/jvm/uwsgiplugin.py
52 =================================================================== 52 ===================================================================
53 --- uwsgi-1.9.15.orig/plugins/jvm/uwsgiplugin.py 53 --- uwsgi-1.9.21.1.orig/plugins/jvm/uwsgiplugin.py
54 +++ uwsgi-1.9.15/plugins/jvm/uwsgiplugin.py 54 +++ uwsgi-1.9.21.1/plugins/jvm/uwsgiplugin.py
55 @@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH: 55 @@ -65,11 +65,6 @@ if "-framework JavaVM" in JVM_LIBPATH:
56 56
57 GCC_LIST = ['jvm_plugin'] 57 GCC_LIST = ['jvm_plugin']
58 58
59 -if 'LD_RUN_PATH' in os.environ: 59 -if 'LD_RUN_PATH' in os.environ:
60 - os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:] 60 - os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:]