From 63b6e188772feb738f73bdef1fca6c3d884be25e Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 3 Jul 2024 23:07:07 +0200 Subject: [PATCH] Fix GH-14792: Compilation failure on pdo_* extensions When building pdo_mysql, pdo_pgsql, or pdo_sqlite from downloaded PHP 8.4 archive, also pdo_sql_parser.h and php_pdo_int.h need to be installed. --- NEWS | 3 +++ ext/pdo/config.m4 | 8 +++++++- ext/pdo/config.w32 | 8 +++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 3fcc8322ecef0..4bd6e99b43776 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 8.4.0alpha2 +- PDO + . Fixed bug GH-14792 (Compilation failure on pdo_* extensions). + (Peter Kokot) 04 Jul 2024, PHP 8.4.0alpha1 diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4 index 76678b9eb0c00..ed1533ea34ccf 100644 --- a/ext/pdo/config.m4 +++ b/ext/pdo/config.m4 @@ -11,6 +11,12 @@ if test "$PHP_PDO" != "no"; then PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared) PHP_ADD_EXTENSION_DEP(pdo, spl) - PHP_INSTALL_HEADERS([ext/pdo], [php_pdo.h php_pdo_driver.h php_pdo_error.h]) + PHP_INSTALL_HEADERS([ext/pdo], m4_normalize([ + pdo_sql_parser.h + php_pdo_driver.h + php_pdo_error.h + php_pdo_int.h + php_pdo.h + ])) PHP_ADD_MAKEFILE_FRAGMENT fi diff --git a/ext/pdo/config.w32 b/ext/pdo/config.w32 index 7ad3781f3e946..d92ccb926ab5a 100644 --- a/ext/pdo/config.w32 +++ b/ext/pdo/config.w32 @@ -6,5 +6,11 @@ if (PHP_PDO != "no") { 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 */); ADD_EXTENSION_DEP('pdo', 'spl'); ADD_MAKEFILE_FRAGMENT(); - PHP_INSTALL_HEADERS("ext/pdo", "php_pdo.h php_pdo_driver.h php_pdo_error.h"); + PHP_INSTALL_HEADERS("ext/pdo", + "pdo_sql_parser.h " + + "php_pdo_driver.h " + + "php_pdo_error.h " + + "php_pdo_int.h " + + "php_pdo.h" + ); }