From owner-svn-ports-all@freebsd.org Thu Jan 30 09:44:33 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5FB7D233508; Thu, 30 Jan 2020 09:44:33 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 487b6T1dC4z3Q0K; Thu, 30 Jan 2020 09:44:33 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2EAC2230C0; Thu, 30 Jan 2020 09:44:33 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00U9iXdG039247; Thu, 30 Jan 2020 09:44:33 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00U9iVl3039241; Thu, 30 Jan 2020 09:44:31 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202001300944.00U9iVl3039241@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Thu, 30 Jan 2020 09:44:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524638 - in head/databases: php72-mysqli/files php73-mysqli/files php74-mysqli/files X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in head/databases: php72-mysqli/files php73-mysqli/files php74-mysqli/files X-SVN-Commit-Revision: 524638 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jan 2020 09:44:33 -0000 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 - - #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN) + #if defined(ulong) && !defined(HAVE_ULONG) + #define HAVE_ULONG