mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

databases/php7[234]-mysqli: unbreak build with system mysql when MYSQLND is disabled

Browse Source 
This is follow-up to r522540 which introduced ability to build with MYSQLND=off

PR:		243643
Submitted by:	fluffy
Approved by:	maintainer (tz)
This commit is contained in:
Dima Panov 2020-01-30 09:44:31 +00:00
parent 60b08e7f73
commit ce74d17066
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=524638
6 changed files with 72 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
databases/php72-mysqli/files/patch-mysqli__api.c Normal file
View File

@ -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 */

9
databases/php72-mysqli/files/patch-php_mysqli_structs.h
View File

@ -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

13
databases/php73-mysqli/files/patch-mysqli__api.c Normal file
View File

@ -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 */

9
databases/php73-mysqli/files/patch-php_mysqli_structs.h
View File

@ -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

13
databases/php74-mysqli/files/patch-mysqli__api.c Normal file
View File

@ -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 */

20
databases/php74-mysqli/files/patch-php_mysqli_structs.h
View File

@ -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 @@
#define WE_HAD_MBSTATE_T
@@ -36,7 +36,7 @@
#define FALSE 0
#endif
+#define HAVE_ULONG 1
#include <my_global.h>
-#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;
#if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN)
#if defined(ulong) && !defined(HAVE_ULONG)
#define HAVE_ULONG