Skip to content

Fix GH-14792: Compilation failure on pdo_* extensions #14797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Fix GH-14792: Compilation failure on pdo_* extensions #14797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 7 additions & 1 deletion ext/pdo/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 7 additions & 1 deletion ext/pdo/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
);
}