Date: Thu, 9 Jan 2020 07:41:39 +0000 (UTC) From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522471 - head/lang/php72/files Message-ID: <202001090741.0097fd6a087353@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Thu Jan 9 07:41:39 2020 New Revision: 522471 URL: https://svnweb.freebsd.org/changeset/ports/522471 Log: Unbreak databases/php72-mysqli when lang/php72 is build with MYSQLND=off Currently when building lang/php72 with MYSQLND=off, its im possible to build databases/php72-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 Сергей <joker@pinnet.ru>. Added: head/lang/php72/files/patch-ext_mysqli_mysqli__api.c (contents, props changed) head/lang/php72/files/patch-ext_mysqli_php__mysqli__structs.h (contents, props changed) Added: head/lang/php72/files/patch-ext_mysqli_mysqli__api.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/php72/files/patch-ext_mysqli_mysqli__api.c Thu Jan 9 07:41:39 2020 (r522471) @@ -0,0 +1,13 @@ +--- ext/mysqli/mysqli_api.c.orig 2020-01-07 10:40:30 UTC ++++ ext/mysqli/mysqli_api.c +@@ -33,8 +33,9 @@ + #include "zend_smart_str.h" + #include "php_mysqli_structs.h" + #include "mysqli_priv.h" ++#if defined(MYSQLI_USE_MYSQLND) + #include "ext/mysqlnd/mysql_float_to_double.h" +- ++#endif + + #if !defined(MYSQLI_USE_MYSQLND) + /* {{{ mysqli_tx_cor_options_to_string */ Added: head/lang/php72/files/patch-ext_mysqli_php__mysqli__structs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/php72/files/patch-ext_mysqli_php__mysqli__structs.h Thu Jan 9 07:41:39 2020 (r522471) @@ -0,0 +1,11 @@ +--- ext/mysqli/php_mysqli_structs.h.orig 2020-01-07 11:18:11 UTC ++++ ext/mysqli/php_mysqli_structs.h +@@ -38,7 +38,7 @@ + #define FALSE 0 + #endif + +-#ifdef MYSQLI_USE_MYSQLND ++#if defined(MYSQLI_USE_MYSQLND) + #include "ext/mysqlnd/mysqlnd.h" + #include "mysqli_mysqlnd.h" + #else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001090741.0097fd6a087353>