From 3a2e913f6665ec663b59fb069c6f755257d19d31 Mon Sep 17 00:00:00 2001 From: Torsten Zuehlsdorff Date: Thu, 9 Jan 2020 22:13:13 +0000 Subject: Unbreak databases/php74-mysqli when lang/php74 is build with MYSQLND=off MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently when building lang/php74 with MYSQLND=off, its im possible to build databases/php74-mysqli. When the option MYSQLND was added, we expected users to not use mysqli at all after disabling this option. This has proven to be wrong, so we patch the build to be work again. patch-ext_mysqli_mysqli__api.c was submitted by Сергей . Merge patches from r522539 into this commit and add two additional patches. --- lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c (limited to 'lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c') diff --git a/lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c b/lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c new file mode 100644 index 000000000000..9baa04218bf9 --- /dev/null +++ b/lang/php74/files/patch-ext_mysqli_mysqli__nonapi.c @@ -0,0 +1,12 @@ +--- ext/mysqli/mysqli_nonapi.c.orig 2020-01-09 11:40:57 UTC ++++ ext/mysqli/mysqli_nonapi.c +@@ -28,7 +28,9 @@ + #include "php_ini.h" + #include "ext/standard/info.h" + #include "zend_smart_str.h" ++#if defined(MYSQLI_USE_MYSQLND) + #include "php_mysqli_structs.h" ++#endif + #include "mysqli_priv.h" + + #define SAFE_STR(a) ((a)?a:"") -- cgit v1.2.3