Date: Thu, 12 Jan 2017 13:54:46 +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: r431266 - in head/databases/php70-mysqli: . files Message-ID: <201701121354.v0CDskse087070@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Thu Jan 12 13:54:46 2017 New Revision: 431266 URL: https://svnweb.freebsd.org/changeset/ports/431266 Log: databases/php70-mysqli: Add patch to build fine with databases/mysql80-client Patch enables the port to build with databases/mysql80-client PR: 215903 Submitted by: Mahdi Mokhtari <mokhi64@gmail.com> Added: head/databases/php70-mysqli/files/patch-mysqli.c (contents, props changed) Modified: head/databases/php70-mysqli/Makefile Modified: head/databases/php70-mysqli/Makefile ============================================================================== --- head/databases/php70-mysqli/Makefile Thu Jan 12 13:50:09 2017 (r431265) +++ head/databases/php70-mysqli/Makefile Thu Jan 12 13:54:46 2017 (r431266) @@ -7,4 +7,6 @@ MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -mysqli +PORTREVISION= 1 + .include "${MASTERDIR}/Makefile" Added: head/databases/php70-mysqli/files/patch-mysqli.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/php70-mysqli/files/patch-mysqli.c Thu Jan 12 13:54:46 2017 (r431266) @@ -0,0 +1,11 @@ +--- mysqli.c.orig 2016-12-06 18:05:01 UTC ++++ mysqli.c +@@ -703,7 +703,7 @@ PHP_MINIT_FUNCTION(mysqli) + #ifdef MYSQLND_STRING_TO_INT_CONVERSION + REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS | CONST_PERSISTENT); + #endif +-#if MYSQL_VERSION_ID > 50110 || defined(MYSQLI_USE_MYSQLND) ++#if (MYSQL_VERSION_ID < 80000 && MYSQL_VERSION_ID > 50110) || defined(MYSQLI_USE_MYSQLND) + REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT); + #endif +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701121354.v0CDskse087070>