From ad4ee9d5c393aaf39bc3bb1821ea22d7f0749331 Mon Sep 17 00:00:00 2001 From: Damjan Georgievski Date: Mon, 16 Sep 2013 12:49:14 +0200 Subject: [PATCH] improve php build script use UWSGICONFIG_PHPLIBDIR to specify the directory of the php library, useful for Debian Wheezy which puts php5.so in /usr/lib/php5 small change: don't use exceptions for flow control --- plugins/php/uwsgiplugin.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py index 6861ce50..4142aeae 100644 --- a/plugins/php/uwsgiplugin.py +++ b/plugins/php/uwsgiplugin.py @@ -5,25 +5,24 @@ NAME='php' ld_run_path = None PHPPATH = 'php-config' -try: - phpdir = os.environ['UWSGICONFIG_PHPDIR'] +phpdir = os.environ.get('UWSGICONFIG_PHPDIR') +if phpdir: ld_run_path = "%s/lib" % phpdir PHPPATH = "%s/bin/php-config" % phpdir -except: - pass -try: - PHPPATH = os.environ['UWSGICONFIG_PHPPATH'] -except: - pass +PHPPATH = os.environ.get('UWSGICONFIG_PHPPATH', PHPPATH) CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-sign-compare'] - 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'] +phplibdir = os.environ.get('UWSGICONFIG_PHPLIBDIR') +if phplibdir: + LIBS.append('-Wl,-rpath=%s' % phplibdir) + GCC_LIST = ['php_plugin']