Mercurial > packages > rhel6 > uwsgi

comparison uwsgi-no-rpath.patch @ 0:9668c317e887

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Initial revision
author Guido Berhoerster <guido+packaging@berhoerster.name>
date Wed, 10 Jul 2013 19:23:16 +0200
parents
children 8f3c148d4f0d
comparison
equal deleted inserted replaced
-1:000000000000 0:9668c317e887
1 Index: uwsgi-1.9.13/plugins/php/uwsgiplugin.py
2 ===================================================================
3 --- uwsgi-1.9.13.orig/plugins/php/uwsgiplugin.py
4 +++ uwsgi-1.9.13/plugins/php/uwsgiplugin.py
5 @@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --include
6 LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
7 if ld_run_path:
8 LDFLAGS.append('-L%s' % ld_run_path)
9 - os.environ['LD_RUN_PATH'] = ld_run_path
10
11 LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
12
13 Index: uwsgi-1.9.13/plugins/python/uwsgiplugin.py
14 ===================================================================
15 --- uwsgi-1.9.13.orig/plugins/python/uwsgiplugin.py
16 +++ uwsgi-1.9.13/plugins/python/uwsgiplugin.py
17 @@ -44,10 +44,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro
18 else:
19 try:
20 LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
21 - os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR'))
22 except:
23 LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX)
24 - os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX
25
26 LIBS.append('-lpython%s' % get_python_version())
27 else:
28 Index: uwsgi-1.9.13/plugins/rack/uwsgiplugin.py
29 ===================================================================
30 --- uwsgi-1.9.13.orig/plugins/rack/uwsgiplugin.py
31 +++ uwsgi-1.9.13/plugins/rack/uwsgiplugin.py
32 @@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir
33
34 if has_shared == 'yes':
35 LDFLAGS.append('-L' + 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())
38 else:
39 GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip()))
40 Index: uwsgi-1.9.13/plugins/ruby19/uwsgiplugin.py
41 ===================================================================
42 --- uwsgi-1.9.13.orig/plugins/ruby19/uwsgiplugin.py
43 +++ uwsgi-1.9.13/plugins/ruby19/uwsgiplugin.py
44 @@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req
45
46 libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
47 LDFLAGS.append('-L' + 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()
50
51 Index: uwsgi-1.9.13/plugins/jvm/uwsgiplugin.py
52 ===================================================================
53 --- uwsgi-1.9.13.orig/plugins/jvm/uwsgiplugin.py
54 +++ uwsgi-1.9.13/plugins/jvm/uwsgiplugin.py
55 @@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH:
56
57 GCC_LIST = ['jvm_plugin']
58
59 -if 'LD_RUN_PATH' in os.environ:
60 - os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:]
61 -else:
62 - os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:]
63 -
64 def post_build(config):
65 if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
66 os._exit(1)