From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/, www-servers/uwsgi/files/
Date: Fri, 28 Apr 2023 00:59:19 +0000 (UTC) [thread overview]
Message-ID: <1682643490.a6e3c66aabe4e19161dfe6f389af0eb349fb0cf4.sam@gentoo> (raw)
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() {
next reply other threads:[~2023-04-28 0:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-28 0:59 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-13 3:03 [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/, www-servers/uwsgi/files/ Sam James
2022-01-20 12:36 Sam James
2022-01-20 12:36 Sam James
2016-05-13 15:57 Alexys Jacob
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1682643490.a6e3c66aabe4e19161dfe6f389af0eb349fb0cf4.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox