www-servers/uwsgi: fix build with php5.6

Bug: https://bugs.gentoo.org/598730

Package-Manager: Portage-2.3.3_p7, Repoman-2.3.1

diff --git a/www-servers/uwsgi/files/2.0.14-php-plugin.patch b/www-servers/uwsgi/files/2.0.14-php-plugin.patch
new file mode 100644 (file)
index 0000000..f60a655
--- /dev/null
+++ b/www-servers/uwsgi/files/2.0.14-php-plugin.patch
@@ -0,0 +1,22 @@
+From 6b332e6f7e6fc3c267a91ce5b5591684575ea271 Mon Sep 17 00:00:00 2001
+From: Damjan Georgievski <gdamjan@gmail.com>
+Date: Thu, 13 Oct 2016 00:55:35 +0200
+Subject: [PATCH] fix issue #1380 - compiling with llvm/freebsd
+
+---
+ plugins/php/php_plugin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
+index 536ec1a..ef30180 100644
+--- a/plugins/php/php_plugin.c
++++ b/plugins/php/php_plugin.c
+@@ -232,7 +232,7 @@ static void sapi_uwsgi_register_variables(zval *track_vars_array TSRMLS_DC)
+                       size_t name_len = equal-usl->value;
+                       char *name = estrndup(usl->value, name_len);
+                       char *strval = equal+1;
+-                      zend_register_string_constant(name, name_len, strval, CONST_CS, 0);
++                      zend_register_string_constant(name, name_len, strval, CONST_CS, 0 TSRMLS_CC);
+               }
+               usl = usl->next;
+       }

diff --git a/www-servers/uwsgi/uwsgi-2.0.14.ebuild b/www-servers/uwsgi/uwsgi-2.0.14.ebuild
index f54848bc781b66b51b4c0430df06c5e6096d0a77..404a756c4da398a4c7488858ed0c8c4dc36e118c 100644 (file)
--- a/www-servers/uwsgi/uwsgi-2.0.14.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.14.ebuild
@@ -144,6 +144,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+       epatch "${FILESDIR}/2.0.14-php-plugin.patch"
+
        sed -i \
                -e "s|'-O2', ||" \
                -e "s|'-Werror', ||" \