Skip to content

Commit ad7d1a7

Browse files
authored
Fix GH-14792: Compilation failure on pdo_* extensions (#14797)
When building pdo_mysql, pdo_pgsql, or pdo_sqlite with phpize from the downloaded PHP 8.4 archive, also pdo_sql_parser.h and php_pdo_int.h need to be installed.
1 parent f230037 commit ad7d1a7

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 8.4.0alpha2
44

5+
- PDO
6+
. Fixed bug GH-14792 (Compilation failure on pdo_* extensions).
7+
(Peter Kokot)
58

69
04 Jul 2024, PHP 8.4.0alpha1
710

ext/pdo/config.m4

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ if test "$PHP_PDO" != "no"; then
1111

1212
PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared)
1313
PHP_ADD_EXTENSION_DEP(pdo, spl)
14-
PHP_INSTALL_HEADERS([ext/pdo], [php_pdo.h php_pdo_driver.h php_pdo_error.h])
14+
PHP_INSTALL_HEADERS([ext/pdo], m4_normalize([
15+
pdo_sql_parser.h
16+
php_pdo_driver.h
17+
php_pdo_error.h
18+
php_pdo_int.h
19+
php_pdo.h
20+
]))
1521
PHP_ADD_MAKEFILE_FRAGMENT
1622
fi

ext/pdo/config.w32

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,11 @@ if (PHP_PDO != "no") {
66
EXTENSION('pdo', 'pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c', false /* force static, PHP_PDO_SHARED is broken yet somehow */);
77
ADD_EXTENSION_DEP('pdo', 'spl');
88
ADD_MAKEFILE_FRAGMENT();
9-
PHP_INSTALL_HEADERS("ext/pdo", "php_pdo.h php_pdo_driver.h php_pdo_error.h");
9+
PHP_INSTALL_HEADERS("ext/pdo",
10+
"pdo_sql_parser.h " +
11+
"php_pdo_driver.h " +
12+
"php_pdo_error.h " +
13+
"php_pdo_int.h " +
14+
"php_pdo.h"
15+
);
1016
}

0 commit comments

Comments
 (0)