Date: Thu, 9 Jan 2020 22:03:41 +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: r522539 - head/lang/php73/files Message-ID: <202001092203.009M3fCf016995@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Thu Jan 9 22:03:40 2020 New Revision: 522539 URL: https://svnweb.freebsd.org/changeset/ports/522539 Log: Unbreak databases/php73-mysqli when lang/php73 is build with MYSQLND=off Currently when building lang/php73 with MYSQLND=off, its im possible to build databases/php73-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>. Merge patches from r522478 into this commit and add two additional patches. Added: head/lang/php73/files/patch-ext_mysqli_mysqli__api.c - copied, changed from r522471, head/lang/php72/files/patch-ext_mysqli_mysqli__api.c head/lang/php73/files/patch-ext_mysqli_mysqli__nonapi.c (contents, props changed) head/lang/php73/files/patch-ext_mysqli_mysqli__prop.c (contents, props changed) head/lang/php73/files/patch-ext_mysqli_php__mysqli__structs.h - copied, changed from r522471, head/lang/php72/files/patch-ext_mysqli_php__mysqli__structs.h Copied and modified: head/lang/php73/files/patch-ext_mysqli_mysqli__api.c (from r522471, head/lang/php72/files/patch-ext_mysqli_mysqli__api.c) ============================================================================== --- head/lang/php72/files/patch-ext_mysqli_mysqli__api.c Thu Jan 9 07:41:39 2020 (r522471, copy source) +++ head/lang/php73/files/patch-ext_mysqli_mysqli__api.c Thu Jan 9 22:03:40 2020 (r522539) @@ -1,6 +1,6 @@ ---- ext/mysqli/mysqli_api.c.orig 2020-01-07 10:40:30 UTC +--- ext/mysqli/mysqli_api.c.orig 2019-12-17 10:29:23 UTC +++ ext/mysqli/mysqli_api.c -@@ -33,8 +33,9 @@ +@@ -31,8 +31,9 @@ #include "zend_smart_str.h" #include "php_mysqli_structs.h" #include "mysqli_priv.h" Added: head/lang/php73/files/patch-ext_mysqli_mysqli__nonapi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/php73/files/patch-ext_mysqli_mysqli__nonapi.c Thu Jan 9 22:03:40 2020 (r522539) @@ -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:"") Added: head/lang/php73/files/patch-ext_mysqli_mysqli__prop.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/php73/files/patch-ext_mysqli_mysqli__prop.c Thu Jan 9 22:03:40 2020 (r522539) @@ -0,0 +1,12 @@ +--- ext/mysqli/mysqli_prop.c.orig 2020-01-09 11:40:11 UTC ++++ ext/mysqli/mysqli_prop.c +@@ -26,7 +26,9 @@ + #include "php.h" + #include "php_ini.h" + #include "ext/standard/info.h" ++#if defined(MYSQLI_USE_MYSQLND) + #include "php_mysqli_structs.h" ++#endif + #include "mysqli_priv.h" + + #define CHECK_STATUS(value) \ Copied and modified: head/lang/php73/files/patch-ext_mysqli_php__mysqli__structs.h (from r522471, head/lang/php72/files/patch-ext_mysqli_php__mysqli__structs.h) ============================================================================== --- head/lang/php72/files/patch-ext_mysqli_php__mysqli__structs.h Thu Jan 9 07:41:39 2020 (r522471, copy source) +++ head/lang/php73/files/patch-ext_mysqli_php__mysqli__structs.h Thu Jan 9 22:03:40 2020 (r522539) @@ -1,6 +1,6 @@ ---- ext/mysqli/php_mysqli_structs.h.orig 2020-01-07 11:18:11 UTC +--- ext/mysqli/php_mysqli_structs.h.orig 2019-12-17 10:29:23 UTC +++ ext/mysqli/php_mysqli_structs.h -@@ -38,7 +38,7 @@ +@@ -36,7 +36,7 @@ #define FALSE 0 #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001092203.009M3fCf016995>