commit:     a6e3c66aabe4e19161dfe6f389af0eb349fb0cf4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 00:58:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 00:58:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6e3c66a

www-servers/uwsgi: fix build w/ newer php

Closes: https://bugs.gentoo.org/904664
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/uwsgi/files/uwsgi-2.0.21-libphp-version.patch | 13 +++++++++++++
 www-servers/uwsgi/uwsgi-2.0.21.ebuild                     |  1 +
 2 files changed, 14 insertions(+)

diff --git a/www-servers/uwsgi/files/uwsgi-2.0.21-libphp-version.patch 
b/www-servers/uwsgi/files/uwsgi-2.0.21-libphp-version.patch
new file mode 100644
index 000000000000..8b0276c3cb89
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-2.0.21-libphp-version.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/904664
+--- a/plugins/php/uwsgiplugin.py
++++ b/plugins/php/uwsgiplugin.py
+@@ -14,6 +14,9 @@
+ 
+ php_version = os.popen(PHPPATH + ' --version').read().rstrip().split('.')[0]
+ 
++if php_version == '8' :
++    php_version = ''
++
+ CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), 
'-Wno-sign-compare']
+ LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
+ 

diff --git a/www-servers/uwsgi/uwsgi-2.0.21.ebuild 
b/www-servers/uwsgi/uwsgi-2.0.21.ebuild
index 6283e0d78a3e..e141c804fb8a 100644
--- a/www-servers/uwsgi/uwsgi-2.0.21.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.21.ebuild
@@ -152,6 +152,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
        "${FILESDIR}"/${P}-php82.patch
        "${FILESDIR}"/${P}-python-unicode.patch
+       "${FILESDIR}"/${P}-libphp-version.patch
 )
 
 pkg_setup() {

Reply via email to