svn commit: r524638 - in head/databases: php72-mysqli/files php73-mysqli/files php74-mysqli/files

[Dima Panov]

Author: fluffy
Date: Thu Jan 30 09:44:31 2020
New Revision: 524638
URL: https://svnweb.freebsd.org/changeset/ports/524638

Log:
  databases/php7[234]-mysqli: unbreak build with system mysql when MYSQLND is disabled
  
  This is follow-up to r522540 which introduced ability to build with MYSQLND=off
  
  PR:		243643
  Submitted by:	fluffy
  Approved by:	maintainer (tz)

Added:
  head/databases/php72-mysqli/files/patch-mysqli__api.c   (contents, props changed)
  head/databases/php73-mysqli/files/patch-mysqli__api.c   (contents, props changed)
  head/databases/php74-mysqli/files/patch-mysqli__api.c   (contents, props changed)
Modified:
  head/databases/php72-mysqli/files/patch-php_mysqli_structs.h
  head/databases/php73-mysqli/files/patch-php_mysqli_structs.h
  head/databases/php74-mysqli/files/patch-php_mysqli_structs.h

Added: head/databases/php72-mysqli/files/patch-mysqli__api.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/php72-mysqli/files/patch-mysqli__api.c	Thu Jan 30 09:44:31 2020	(r524638)
@@ -0,0 +1,13 @@
+--- mysqli_api.c.orig	2020-01-07 10:40:30 UTC
++++ 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 */

Modified: head/databases/php72-mysqli/files/patch-php_mysqli_structs.h
==============================================================================
--- head/databases/php72-mysqli/files/patch-php_mysqli_structs.h	Thu Jan 30 08:26:22 2020	(r524637)
+++ head/databases/php72-mysqli/files/patch-php_mysqli_structs.h	Thu Jan 30 09:44:31 2020	(r524638)
@@ -1,5 +1,14 @@
 --- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
 +++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
+@@ -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
 @@ -54,6 +54,7 @@
  #define WE_HAD_MBSTATE_T
  #endif

Added: head/databases/php73-mysqli/files/patch-mysqli__api.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/php73-mysqli/files/patch-mysqli__api.c	Thu Jan 30 09:44:31 2020	(r524638)
@@ -0,0 +1,13 @@
+--- mysqli_api.c.orig	2019-12-17 10:29:23 UTC
++++ mysqli_api.c
+@@ -31,8 +31,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 */

Modified: head/databases/php73-mysqli/files/patch-php_mysqli_structs.h
==============================================================================
--- head/databases/php73-mysqli/files/patch-php_mysqli_structs.h	Thu Jan 30 08:26:22 2020	(r524637)
+++ head/databases/php73-mysqli/files/patch-php_mysqli_structs.h	Thu Jan 30 09:44:31 2020	(r524638)
@@ -1,5 +1,14 @@
 --- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
 +++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
+@@ -36,7 +36,7 @@
+ #define FALSE 0
+ #endif
+ 
+-#ifdef MYSQLI_USE_MYSQLND
++#if defined(MYSQLI_USE_MYSQLND)
+ #include "ext/mysqlnd/mysqlnd.h"
+ #include "mysqli_mysqlnd.h"
+ #else
 @@ -54,6 +54,7 @@
  #define WE_HAD_MBSTATE_T
  #endif

Added: head/databases/php74-mysqli/files/patch-mysqli__api.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/php74-mysqli/files/patch-mysqli__api.c	Thu Jan 30 09:44:31 2020	(r524638)
@@ -0,0 +1,13 @@
+--- mysqli_api.c.orig	2019-12-17 10:29:23 UTC
++++ mysqli_api.c
+@@ -31,8 +31,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 */

Modified: head/databases/php74-mysqli/files/patch-php_mysqli_structs.h
==============================================================================
--- head/databases/php74-mysqli/files/patch-php_mysqli_structs.h	Thu Jan 30 08:26:22 2020	(r524637)
+++ head/databases/php74-mysqli/files/patch-php_mysqli_structs.h	Thu Jan 30 09:44:31 2020	(r524638)
@@ -1,10 +1,20 @@
 --- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
 +++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
-@@ -54,6 +54,7 @@
+@@ -36,7 +36,7 @@
+ #define FALSE 0
+ #endif
+ 
+-#ifdef MYSQLI_USE_MYSQLND
++#if defined(MYSQLI_USE_MYSQLND)
+ #include "ext/mysqlnd/mysqlnd.h"
+ #include "mysqli_mysqlnd.h"
+ #else
+@@ -53,6 +53,8 @@
+ #undef HAVE_MBSTATE_T
  #define WE_HAD_MBSTATE_T
  #endif
++
++typedef zend_ulong ulong;
  
-+#define HAVE_ULONG 1
- #include <my_global.h>
- 
- #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN)
+ #if defined(ulong) && !defined(HAVE_ULONG)
+ #define HAVE_ULONG