Skip to content

Commit 0ed1341

Browse files
authored
Update mysqli and pdo_mysql extension dependencies (#14633)
- The mysqlnd is required dependency in mysqli extension - When building pdo_mysql with mysqlnd (--with-pdo-mysql or --with-pdo-mysql=mysqlnd) mysqlnd is required - This also adds missing configure time pdo dependency to pdo_mysql
1 parent 678a481 commit 0ed1341

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ext/mysqli/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if (PHP_MYSQLI != "no") {
2121

2222
if (PHP_MYSQLI != "no") {
2323
EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
24-
ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
24+
ADD_EXTENSION_DEP('mysqli', 'mysqlnd');
2525
PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h mysqli_mysqlnd.h");
2626
}
2727
}

ext/pdo_mysql/config.w32

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if (PHP_PDO_MYSQL != "no") {
88
STDOUT.WriteLine("INFO: mysqlnd build");
99
EXTENSION("pdo_mysql", "pdo_mysql.c mysql_driver.c mysql_statement.c mysql_sql_parser.c");
1010
ADD_EXTENSION_DEP('pdo_mysql', 'pdo');
11+
ADD_EXTENSION_DEP('pdo_mysql', 'mysqlnd');
1112
ADD_MAKEFILE_FRAGMENT();
1213
} else {
1314
if (CHECK_LIB("libmysql.lib", "pdo_mysql", PHP_PDO_MYSQL) &&
@@ -16,7 +17,8 @@ if (PHP_PDO_MYSQL != "no") {
1617
PHP_PHP_BUILD + "\\include\\mysql;" +
1718
PHP_PDO_MYSQL)) {
1819
EXTENSION("pdo_mysql", "pdo_mysql.c mysql_driver.c mysql_statement.c mysql_sql_parser.c", null, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
19-
ADD_MAKEFILE_FRAGMENT();
20+
ADD_EXTENSION_DEP('pdo_mysql', 'pdo');
21+
ADD_MAKEFILE_FRAGMENT();
2022
} else {
2123
WARNING("pdo_mysql not enabled; libraries and headers not found");
2224
}

0 commit comments

Comments
 (0)