Mercurial > packages > rhel6 > uwsgi

annotate uwsgi-no-rpath.patch @ 5:e6b2af6272a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to version 2.0
author Guido Berhoerster <guido+packaging@berhoerster.name>
date Wed, 08 Jan 2014 19:46:46 +0100
parents 851739edafa6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
1 Index: uwsgi-1.9.21.1/plugins/php/uwsgiplugin.py
0
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
2 ===================================================================
4
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
3 --- uwsgi-1.9.21.1.orig/plugins/php/uwsgiplugin.py
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
4 +++ uwsgi-1.9.21.1/plugins/php/uwsgiplugin.py
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
5 @@ -17,7 +17,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
6
0
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
7 if ld_run_path:
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
8 LDFLAGS.append('-L%s' % ld_run_path)
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
9 - os.environ['LD_RUN_PATH'] = ld_run_path
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
10
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
11 LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
12
4
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
13 Index: uwsgi-1.9.21.1/plugins/python/uwsgiplugin.py
0
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
14 ===================================================================
4
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
15 --- uwsgi-1.9.21.1.orig/plugins/python/uwsgiplugin.py
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
16 +++ uwsgi-1.9.21.1/plugins/python/uwsgiplugin.py
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
17 @@ -52,10 +52,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro
0
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
18 else:
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
19 try:
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
20 LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
21 - os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR'))
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
22 except:
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
23 LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX)
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
24 - os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
25
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
26 LIBS.append('-lpython%s' % get_python_version())
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
27 else:
4
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
28 Index: uwsgi-1.9.21.1/plugins/rack/uwsgiplugin.py
0
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
29 ===================================================================
4
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
30 --- uwsgi-1.9.21.1.orig/plugins/rack/uwsgiplugin.py
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
31 +++ uwsgi-1.9.21.1/plugins/rack/uwsgiplugin.py
0
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
32 @@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
33
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
34 if has_shared == 'yes':
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
35 LDFLAGS.append('-L' + libpath )
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
36 - os.environ['LD_RUN_PATH'] = libpath
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
37 LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
38 else:
3
8f3c148d4f0d Update to version 1.9.15
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 0
diff changeset
39 rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip()
4
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
40 Index: uwsgi-1.9.21.1/plugins/ruby19/uwsgiplugin.py
0
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
41 ===================================================================
4
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
42 --- uwsgi-1.9.21.1.orig/plugins/ruby19/uwsgiplugin.py
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
43 +++ uwsgi-1.9.21.1/plugins/ruby19/uwsgiplugin.py
0
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
44 @@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
45
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
46 libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
47 LDFLAGS.append('-L' + libpath )
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
48 -os.environ['LD_RUN_PATH'] = libpath
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
49 LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split()
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
50
4
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
51 Index: uwsgi-1.9.21.1/plugins/jvm/uwsgiplugin.py
0
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
52 ===================================================================
4
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
53 --- uwsgi-1.9.21.1.orig/plugins/jvm/uwsgiplugin.py
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
54 +++ uwsgi-1.9.21.1/plugins/jvm/uwsgiplugin.py
851739edafa6 Update to version 1.9.21.1
Guido Berhoerster <guido+packaging@berhoerster.name>
parents: 3
diff changeset
55 @@ -65,11 +65,6 @@ if "-framework JavaVM" in JVM_LIBPATH:
0
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
56
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
57 GCC_LIST = ['jvm_plugin']
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
58
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
59 -if 'LD_RUN_PATH' in os.environ:
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
60 - os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:]
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
61 -else:
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
62 - os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:]
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
63 -
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
64 def post_build(config):
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
65 if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
9668c317e887 Initial revision
Guido Berhoerster <guido+packaging@berhoerster.name>
parents:
diff changeset
66 os._exit(1)