diff options
| author | Remi Collet <remi@remirepo.net> | 2022-02-14 10:29:31 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2022-02-14 10:29:31 +0100 |
| commit | a8a769712ab226db4557844ab0a1a70fd50ee39c (patch) | |
| tree | 54727eac111a7bdf3595cf6c325dac1c7c66ebb8 /uwsgi_fix_php8.patch | |
| parent | 391d8bd573a80cc3bbde42caa0f2d3b480dd5d36 (diff) | |
update to 2.0.20
Diffstat (limited to 'uwsgi_fix_php8.patch')
| -rw-r--r-- | uwsgi_fix_php8.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/uwsgi_fix_php8.patch b/uwsgi_fix_php8.patch new file mode 100644 index 0000000..1685a0f --- /dev/null +++ b/uwsgi_fix_php8.patch @@ -0,0 +1,17 @@ +diff -uNr a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py +--- a/plugins/php/uwsgiplugin.py 2022-01-22 22:40:33.783038869 +0100 ++++ b/plugins/php/uwsgiplugin.py 2022-01-22 22:41:45.261394898 +0100 +@@ -21,7 +21,12 @@ 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(), '-lphp' + php_version] ++# PHP8 and above does not add the version to the library ++# name ++if int(php_version) < 8: ++ LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version] ++else: ++ LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp'] + + phplibdir = os.environ.get('UWSGICONFIG_PHPLIBDIR') + if phplibdir: |