Merge branch 'PHP-8.4'

petk · petk · commit 5ab63b31627c · 2024-11-02T23:55:28.000+01:00
diff --git a/cmake/Zend/CMakeLists.txt b/cmake/Zend/CMakeLists.txt
@@ -640,7 +640,7 @@ if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
   )
 endif()
 
-configure_file(zend_config.cmake.h.in CMakeFiles/zend_config.h @ONLY)
+configure_file(zend_config.cmake.h.in CMakeFiles/zend_config.h)
 
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
   message(STATUS "Creating Zend/zend_config.h")
diff --git a/cmake/ext/bcmath/CMakeLists.txt b/cmake/ext/bcmath/CMakeLists.txt
@@ -66,4 +66,4 @@ target_compile_definitions(php_bcmath PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
 set(HAVE_BCMATH 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/bz2/CMakeLists.txt b/cmake/ext/bz2/CMakeLists.txt
@@ -74,4 +74,4 @@ endif()
 
 set(HAVE_BZ2 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/calendar/CMakeLists.txt b/cmake/ext/calendar/CMakeLists.txt
@@ -48,4 +48,4 @@ target_sources(
 
 set(HAVE_CALENDAR 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/com_dotnet/CMakeLists.txt b/cmake/ext/com_dotnet/CMakeLists.txt
@@ -69,4 +69,4 @@ check_include_file(mscoree.h HAVE_MSCOREE_H)
 
 set(HAVE_COM_DOTNET 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/ctype/CMakeLists.txt b/cmake/ext/ctype/CMakeLists.txt
@@ -41,4 +41,4 @@ target_sources(
 
 set(HAVE_CTYPE 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/curl/CMakeLists.txt b/cmake/ext/curl/CMakeLists.txt
@@ -160,4 +160,4 @@ endif()
 
 set(HAVE_CURL 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/date/CMakeLists.txt b/cmake/ext/date/CMakeLists.txt
@@ -84,4 +84,4 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lib/timelib_config.h [[
 #define timelib_free    efree
 ]])
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/dba/CMakeLists.txt b/cmake/ext/dba/CMakeLists.txt
@@ -338,4 +338,4 @@ endif()
 
 set(HAVE_DBA 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/dom/CMakeLists.txt b/cmake/ext/dom/CMakeLists.txt
@@ -279,4 +279,4 @@ add_dependencies(php_dom php_libxml php_random)
 
 set(HAVE_DOM 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/enchant/CMakeLists.txt b/cmake/ext/enchant/CMakeLists.txt
@@ -78,4 +78,4 @@ target_link_libraries(php_enchant PRIVATE Enchant::Enchant)
 
 set(HAVE_ENCHANT 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/exif/CMakeLists.txt b/cmake/ext/exif/CMakeLists.txt
@@ -49,4 +49,4 @@ endif()
 
 set(HAVE_EXIF 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/ffi/CMakeLists.txt b/cmake/ext/ffi/CMakeLists.txt
@@ -80,4 +80,4 @@ endif()
 
 set(HAVE_FFI 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/fileinfo/CMakeLists.txt b/cmake/ext/fileinfo/CMakeLists.txt
@@ -98,4 +98,4 @@ set_property(
 
 add_dependencies(php_fileinfo php_pcre)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/ftp/CMakeLists.txt b/cmake/ext/ftp/CMakeLists.txt
@@ -73,4 +73,4 @@ add_feature_info(
 
 set(HAVE_FTP 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/gd/CMakeLists.txt b/cmake/ext/gd/CMakeLists.txt
@@ -465,4 +465,4 @@ else()
   endif()
 endif()
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/gettext/CMakeLists.txt b/cmake/ext/gettext/CMakeLists.txt
@@ -69,4 +69,4 @@ if(TARGET Intl::Intl)
   check_library_exists(Intl::Intl bind_textdomain_codeset "" HAVE_BIND_TEXTDOMAIN_CODESET)
 endif()
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/gmp/CMakeLists.txt b/cmake/ext/gmp/CMakeLists.txt
@@ -59,4 +59,4 @@ add_dependencies(php_gmp php_random)
 
 set(HAVE_GMP 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/hash/CMakeLists.txt b/cmake/ext/hash/CMakeLists.txt
@@ -129,4 +129,4 @@ else()
   )
 endif()
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/iconv/CMakeLists.txt b/cmake/ext/iconv/CMakeLists.txt
@@ -230,4 +230,4 @@ endif()
 
 set(HAVE_ICONV 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/ldap/CMakeLists.txt b/cmake/ext/ldap/CMakeLists.txt
@@ -113,4 +113,4 @@ endif()
 
 set(HAVE_LDAP 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/libxml/CMakeLists.txt b/cmake/ext/libxml/CMakeLists.txt
@@ -66,4 +66,4 @@ target_link_libraries(php_libxml PUBLIC LibXml2::LibXml2)
 
 set(HAVE_LIBXML 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/mbstring/CMakeLists.txt b/cmake/ext/mbstring/CMakeLists.txt
@@ -202,4 +202,4 @@ target_include_directories(
 
 set(HAVE_MBSTRING 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/mysqli/CMakeLists.txt b/cmake/ext/mysqli/CMakeLists.txt
@@ -96,4 +96,4 @@ if(MySQL_Socket_PATH)
   set(PHP_MYSQL_UNIX_SOCK_ADDR "${MySQL_Socket_PATH}")
 endif()
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/mysqlnd/CMakeLists.txt b/cmake/ext/mysqlnd/CMakeLists.txt
@@ -167,4 +167,4 @@ add_feature_info(
   "Extended SSL support through a system library"
 )
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/odbc/CMakeLists.txt b/cmake/ext/odbc/CMakeLists.txt
@@ -175,4 +175,4 @@ endif()
 
 set(HAVE_UODBC 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/opcache/CMakeLists.txt b/cmake/ext/opcache/CMakeLists.txt
@@ -312,4 +312,4 @@ if(TARGET PHP::CheckSHMLibrary)
   target_link_libraries(php_opcache PRIVATE PHP::CheckSHMLibrary)
 endif()
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/openssl/CMakeLists.txt b/cmake/ext/openssl/CMakeLists.txt
@@ -154,4 +154,4 @@ endif()
 
 set(HAVE_OPENSSL_EXT 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/pcntl/CMakeLists.txt b/cmake/ext/pcntl/CMakeLists.txt
@@ -173,4 +173,4 @@ cmake_push_check_state(RESET)
   endblock()
 cmake_pop_check_state()
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/pcre/CMakeLists.txt b/cmake/ext/pcre/CMakeLists.txt
@@ -232,4 +232,4 @@ add_feature_info(
   "PCRE Just-In-Time compiling support"
 )
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/pdo_mysql/CMakeLists.txt b/cmake/ext/pdo_mysql/CMakeLists.txt
@@ -112,4 +112,4 @@ if(RE2C_FOUND)
   )
 endif()
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/pdo_odbc/CMakeLists.txt b/cmake/ext/pdo_odbc/CMakeLists.txt
@@ -244,4 +244,4 @@ endif()
 
 target_link_libraries(php_pdo_odbc PRIVATE ODBC::ODBC)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/pdo_pgsql/CMakeLists.txt b/cmake/ext/pdo_pgsql/CMakeLists.txt
@@ -103,4 +103,4 @@ endif()
 
 set(HAVE_PDO_PGSQL 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/pdo_sqlite/CMakeLists.txt b/cmake/ext/pdo_sqlite/CMakeLists.txt
@@ -91,4 +91,4 @@ if(RE2C_FOUND)
   )
 endif()
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/pgsql/CMakeLists.txt b/cmake/ext/pgsql/CMakeLists.txt
@@ -129,4 +129,4 @@ endif()
 
 set(HAVE_PGSQL 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/posix/CMakeLists.txt b/cmake/ext/posix/CMakeLists.txt
@@ -107,4 +107,4 @@ cmake_pop_check_state()
 
 set(HAVE_POSIX 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/random/CMakeLists.txt b/cmake/ext/random/CMakeLists.txt
@@ -57,4 +57,4 @@ endblock()
 # TODO: Fix this better with object libraries in the future.
 target_link_libraries(php_random PRIVATE Zend::Zend)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/readline/CMakeLists.txt b/cmake/ext/readline/CMakeLists.txt
@@ -104,7 +104,7 @@ cmake_push_check_state(RESET)
   )
 cmake_pop_check_state()
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
 
 # TODO: Editline/Readline dependent libraries shouldn't be linked on this level.
 # Recheck if this is really needed. Either move to find modules or remove it.
diff --git a/cmake/ext/session/CMakeLists.txt b/cmake/ext/session/CMakeLists.txt
@@ -117,4 +117,4 @@ endif()
 
 set(HAVE_PHP_SESSION 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/shmop/CMakeLists.txt b/cmake/ext/shmop/CMakeLists.txt
@@ -41,4 +41,4 @@ target_sources(
 
 set(HAVE_SHMOP 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/simplexml/CMakeLists.txt b/cmake/ext/simplexml/CMakeLists.txt
@@ -67,4 +67,4 @@ target_link_libraries(php_simplexml PRIVATE LibXml2::LibXml2)
 
 set(HAVE_SIMPLEXML 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/skeleton/CMakeLists.txt.in b/cmake/ext/skeleton/CMakeLists.txt.in
@@ -99,4 +99,4 @@ install(
 
 set(PHP_EXTENSION_%EXTNAMECAPS% 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/snmp/CMakeLists.txt b/cmake/ext/snmp/CMakeLists.txt
@@ -79,4 +79,4 @@ endif()
 
 set(HAVE_SNMP 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/soap/CMakeLists.txt b/cmake/ext/soap/CMakeLists.txt
@@ -71,4 +71,4 @@ endif()
 
 set(HAVE_SOAP 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/sockets/CMakeLists.txt b/cmake/ext/sockets/CMakeLists.txt
@@ -112,4 +112,4 @@ cmake_pop_check_state()
 
 set(HAVE_SOCKETS 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/sodium/CMakeLists.txt b/cmake/ext/sodium/CMakeLists.txt
@@ -71,4 +71,4 @@ endif()
 
 set(HAVE_LIBSODIUMLIB 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/sqlite3/CMakeLists.txt b/cmake/ext/sqlite3/CMakeLists.txt
@@ -81,4 +81,4 @@ endif()
 
 set(HAVE_SQLITE3 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/standard/CMakeLists.txt b/cmake/ext/standard/CMakeLists.txt
@@ -483,4 +483,4 @@ endblock()
 # being built.
 set(ENABLE_CHROOT_FUNC 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/sysvmsg/CMakeLists.txt b/cmake/ext/sysvmsg/CMakeLists.txt
@@ -57,4 +57,4 @@ target_sources(
 
 set(HAVE_SYSVMSG 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/sysvsem/CMakeLists.txt b/cmake/ext/sysvsem/CMakeLists.txt
@@ -53,4 +53,4 @@ cmake_pop_check_state()
 
 set(HAVE_SYSVSEM 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/sysvshm/CMakeLists.txt b/cmake/ext/sysvshm/CMakeLists.txt
@@ -41,4 +41,4 @@ target_sources(
 
 set(HAVE_SYSVSHM 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/tidy/CMakeLists.txt b/cmake/ext/tidy/CMakeLists.txt
@@ -74,4 +74,4 @@ endif()
 
 set(HAVE_TIDY 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/xml/CMakeLists.txt b/cmake/ext/xml/CMakeLists.txt
@@ -106,4 +106,4 @@ endif()
 
 set(HAVE_XML 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/xmlreader/CMakeLists.txt b/cmake/ext/xmlreader/CMakeLists.txt
@@ -66,4 +66,4 @@ add_dependencies(php_xmlreader php_libxml)
 
 set(HAVE_XMLREADER 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/xmlwriter/CMakeLists.txt b/cmake/ext/xmlwriter/CMakeLists.txt
@@ -63,4 +63,4 @@ add_dependencies(php_xmlwriter php_libxml)
 
 set(HAVE_XMLWRITER 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/xsl/CMakeLists.txt b/cmake/ext/xsl/CMakeLists.txt
@@ -99,4 +99,4 @@ add_feature_info(
 
 set(HAVE_XSL 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/zip/CMakeLists.txt b/cmake/ext/zip/CMakeLists.txt
@@ -139,4 +139,4 @@ endif()
 
 set(HAVE_ZIP 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)
diff --git a/cmake/ext/zlib/CMakeLists.txt b/cmake/ext/zlib/CMakeLists.txt
@@ -56,4 +56,4 @@ target_link_libraries(php_zlib PRIVATE ZLIB::ZLIB)
 
 set(HAVE_ZLIB 1)
 
-configure_file(config.cmake.h.in config.h @ONLY)
+configure_file(config.cmake.h.in config.h)

Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,7 @@ if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)`
`640`	`640`	`)`
`641`	`641`	`endif()`
`642`	`642`
`643`		`-configure_file(zend_config.cmake.h.in CMakeFiles/zend_config.h @ONLY)`
	`643`	`+configure_file(zend_config.cmake.h.in CMakeFiles/zend_config.h)`
`644`	`644`
`645`	`645`	`if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")`
`646`	`646`	`message(STATUS "Creating Zend/zend_config.h")`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,4 @@ target_compile_definitions(php_bcmath PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE=1)`
`66`	`66`
`67`	`67`	`set(HAVE_BCMATH 1)`
`68`	`68`
`69`		`-configure_file(config.cmake.h.in config.h @ONLY)`
	`69`	`+configure_file(config.cmake.h.in config.h)`
Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,4 @@ endif()`
`74`	`74`
`75`	`75`	`set(HAVE_BZ2 1)`
`76`	`76`
`77`		`-configure_file(config.cmake.h.in config.h @ONLY)`
	`77`	`+configure_file(config.cmake.h.in config.h)`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,4 @@ target_sources(`
`48`	`48`
`49`	`49`	`set(HAVE_CALENDAR 1)`
`50`	`50`
`51`		`-configure_file(config.cmake.h.in config.h @ONLY)`
	`51`	`+configure_file(config.cmake.h.in config.h)`
Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,4 @@ check_include_file(mscoree.h HAVE_MSCOREE_H)`
`69`	`69`
`70`	`70`	`set(HAVE_COM_DOTNET 1)`
`71`	`71`
`72`		`-configure_file(config.cmake.h.in config.h @ONLY)`
	`72`	`+configure_file(config.cmake.h.in config.h)`
Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,4 @@ target_sources(`
`41`	`41`
`42`	`42`	`set(HAVE_CTYPE 1)`
`43`	`43`
`44`		`-configure_file(config.cmake.h.in config.h @ONLY)`
	`44`	`+configure_file(config.cmake.h.in config.h)`
Original file line number	Diff line number	Diff line change
`@@ -160,4 +160,4 @@ endif()`
`160`	`160`
`161`	`161`	`set(HAVE_CURL 1)`
`162`	`162`
`163`		`-configure_file(config.cmake.h.in config.h @ONLY)`
	`163`	`+configure_file(config.cmake.h.in config.h)`
Original file line number	Diff line number	Diff line change
`@@ -338,4 +338,4 @@ endif()`
`338`	`338`
`339`	`339`	`set(HAVE_DBA 1)`
`340`	`340`
`341`		`-configure_file(config.cmake.h.in config.h @ONLY)`
	`341`	`+configure_file(config.cmake.h.in config.h)`
Original file line number	Diff line number	Diff line change
`@@ -279,4 +279,4 @@ add_dependencies(php_dom php_libxml php_random)`
`279`	`279`
`280`	`280`	`set(HAVE_DOM 1)`
`281`	`281`
`282`		`-configure_file(config.cmake.h.in config.h @ONLY)`
	`282`	`+configure_file(config.cmake.h.in config.h)`