Skip to content

Commit 8e4f790

Browse files
committed
Merge branch 'PHP-8.4'
2 parents 28a8cdc + 0461a3f commit 8e4f790

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

cmake/ext/pdo_pgsql/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ set_package_properties(
8181

8282
target_link_libraries(php_ext_pdo_pgsql PUBLIC PostgreSQL::PostgreSQL)
8383

84-
# Sanity check.
84+
# Check PostgreSQL library (libpq) features.
8585
if(TARGET PostgreSQL::PostgreSQL)
8686
cmake_push_check_state(RESET)
8787
set(CMAKE_REQUIRED_LIBRARIES PostgreSQL::PostgreSQL)

cmake/ext/pgsql/CMakeLists.txt

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,7 @@ set_package_properties(
8585

8686
target_link_libraries(php_ext_pgsql PUBLIC PostgreSQL::PostgreSQL)
8787

88-
# Check features of PostgreSQL library (libpq). As of PostgreSQL (and libpq)
89-
# version 14 there are features macros available in the libpq-fe.h. Additional
90-
# checks for specific symbols below are done to avoid issues present on
91-
# platforms that might package libpq development headers and PostgreSQL server
92-
# development headers into a single all-in-one package (for example,
93-
# postgresql-devel on openSUSE Linux at least on version 15), where libpq
94-
# package contains the latest library, but the development package contains the
95-
# header files of different PostgreSQL version (for example, postgresql16-devel)
96-
# Which leads to unexpected behavior if libpq would be version 17, but
97-
# libpq-fe.h would belong to the package version 16. Otherwise, ideally only
98-
# feature macros checks (LIBPQ_HAS_CHUNK_MODE, etc.) should be sufficient for
99-
# most platforms.
100-
88+
# Check PostgreSQL library (libpq) features.
10189
if(TARGET PostgreSQL::PostgreSQL)
10290
cmake_push_check_state(RESET)
10391
set(CMAKE_REQUIRED_LIBRARIES PostgreSQL::PostgreSQL)

0 commit comments

Comments
 (0)