Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/Zend/CMakeLists.txt

@@ -394,8 +394,8 @@ block()
   set(headers pthread.h)
 
   # BSD-based systems have pthread_attr_get_np in pthread_np.h.
-  check_include_files(pthread_np.h _PHP_HAVE_PTHREAD_NP_H)
-  if(_PHP_HAVE_PTHREAD_NP_H)
+  check_include_files(pthread_np.h PHP_HAS_PTHREAD_NP_H)
+  if(PHP_HAS_PTHREAD_NP_H)
     list(APPEND headers "pthread_np.h")
   endif()
 

cmake/cmake/Flags.cmake

@@ -26,7 +26,6 @@ endif()
 # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86914
 if(
   CMAKE_C_COMPILER_ID STREQUAL "GNU"
-  AND DEFINED CMAKE_C_COMPILER_VERSION
   AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8
   AND CMAKE_C_COMPILER_VERSION VERSION_LESS 8.3
 )
@@ -64,21 +63,25 @@ target_compile_options(
     $<$<AND:$<BOOL:${PHP_HAS_WNO_UNUSED_PARAMETER_CXX}>,$<COMPILE_LANGUAGE:CXX>>:-Wno-unused-parameter>
 )
 
-if(MSVC)
-  target_compile_options(
-    php_config
-    BEFORE
-    INTERFACE
-      $<$<COMPILE_LANGUAGE:ASM,C,CXX>:/W4>
-  )
-else()
-  target_compile_options(
-    php_config
-    BEFORE
-    INTERFACE
-      $<$<COMPILE_LANGUAGE:ASM,C,CXX>:-Wall;-Wextra>
-  )
-endif()
+php_check_compiler_flag(C -Wextra PHP_HAS_WEXTRA_C)
+php_check_compiler_flag(CXX -Wextra PHP_HAS_WEXTRA_CXX)
+target_compile_options(
+  php_config
+  BEFORE
+  INTERFACE
+    $<$<AND:$<BOOL:${PHP_HAS_WEXTRA_C}>,$<COMPILE_LANGUAGE:ASM,C>>:-Wextra>
+    $<$<AND:$<BOOL:${PHP_HAS_WEXTRA_CXX}>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>
+)
+
+php_check_compiler_flag(C -Wall PHP_HAS_WALL_C)
+php_check_compiler_flag(CXX -Wall PHP_HAS_WALL_CXX)
+target_compile_options(
+  php_config
+  BEFORE
+  INTERFACE
+    $<$<AND:$<BOOL:${PHP_HAS_WALL_C}>,$<COMPILE_LANGUAGE:ASM,C>>:-Wall>
+    $<$<AND:$<BOOL:${PHP_HAS_WALL_CXX}>,$<COMPILE_LANGUAGE:CXX>>:-Wall>
+)
 
 # Check if compiler supports -Wno-clobbered (only GCC).
 php_check_compiler_flag(C -Wno-clobbered PHP_HAS_WNO_CLOBBERED_C)

cmake/cmake/modules/FindMC.cmake

@@ -1,7 +1,11 @@
 #[=============================================================================[
 # FindMC
 
-Find Windows compatible message compiler (mc.exe or windmc) command-line tool.
+Finds Windows compatible message compiler (mc.exe or windmc) command-line tool:
+
+```cmake
+find_package(MC [...])
+```
 
 Message compiler is installed on Windows as part of the Visual Studio or Windows
 SDK. When cross-compiling for Windows, there is also a compatible alternative by
@@ -16,9 +20,9 @@ https://sourceware.org/binutils/docs/binutils.html#windmc.
 
 * `MC_EXECUTABLE` - Path to the message compiler if found.
 
-## Functions provided by this module
+## Commands
 
-Module exposes the following function:
+This module provides the following command:
 
 ```cmake
 mc_target(
@@ -33,20 +37,23 @@ mc_target(
 ```
 
 * `NAME` - Target name.
-* `INPUT` - Input message file to compile.
+* `INPUT` - Input message file to compile. Relative path is interpreted as being
+  relative to the current source directory.
 * `HEADER_DIR` - Set the export directory for headers, otherwise current binary
   directory will be used.
-* `RC_DIR` - Set the export directory for rc files.
+* `RC_DIR` - Set the export directory for rc files, otherwise current binary
+  directory will be used.
 * `XDBG_DIR` - Where to create the .dbg C include file that maps message IDs to
   their symbolic name.
 * `OPTIONS` - A list of additional options to pass to message compiler tool.
 * `DEPENDS` - Optional list of dependent files to recompile message file.
 
-## Usage
+## Examples
 
 ```cmake
 # CMakeLists.txt
 find_package(MC)
+mc_target(...)
 ```
 #]=============================================================================]
 
@@ -137,11 +144,12 @@ endblock()
 
 set(_reason "")
 
-if(NOT MC_EXECUTABLE OR NOT EXISTS ${MC_EXECUTABLE})
-  string(APPEND _reason "Message compiler command-line tool (mc) not found. ")
-else()
-  # If MC_EXECUTABLE was found or was set by the user and path exists.
+# Check whether MC_EXECUTABLE exists.
+if(EXISTS "${MC_EXECUTABLE}")
   set(_mc_exists TRUE)
+else()
+  set(_mc_exists FALSE)
+  string(APPEND _reason "Message compiler command-line tool (mc) not found. ")
 endif()
 
 mark_as_advanced(MC_EXECUTABLE)
@@ -190,6 +198,13 @@ function(mc_target)
     return()
   endif()
 
+  cmake_path(
+    ABSOLUTE_PATH
+    parsed_INPUT
+    BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    NORMALIZE
+  )
+
   # Set default header export directory if empty.
   if(NOT parsed_HEADER_DIR)
     set(parsed_HEADER_DIR ${CMAKE_CURRENT_BINARY_DIR})

cmake/cmake/modules/PHP/CheckFopencookie.cmake

@@ -37,10 +37,10 @@ include(CMakePushCheckState)
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(fopencookie stdio.h _PHP_HAVE_FOPENCOOKIE)
+  check_symbol_exists(fopencookie stdio.h PHP_HAS_FOPENCOOKIE)
 cmake_pop_check_state()
 
-if(NOT _PHP_HAVE_FOPENCOOKIE)
+if(NOT PHP_HAS_FOPENCOOKIE)
   return()
 endif()
 

cmake/cmake/modules/PHP/CheckGethostbynameR.cmake

@@ -65,10 +65,10 @@ function(_php_check_gethostbyname_r)
     HEADERS netdb.h
     LIBRARIES
       nsl # Solaris <= 11.3, illumos
-    VARIABLE _PHP_HAVE_GETHOSTBYNAME_R
+    VARIABLE PHP_HAS_GETHOSTBYNAME_R
     LIBRARY_VARIABLE library
   )
-  if(NOT _PHP_HAVE_GETHOSTBYNAME_R)
+  if(NOT PHP_HAS_GETHOSTBYNAME_R)
     message(CHECK_FAIL "not found")
     return()
   endif()

cmake/cmake/modules/PHP/CheckIPv6.cmake

@@ -48,10 +48,10 @@ cmake_push_check_state(RESET)
 
       return 0;
     }
-  ]] _PHP_HAVE_IPV6)
+  ]] PHP_HAS_IPV6)
 cmake_pop_check_state()
 
-if(_PHP_HAVE_IPV6)
+if(PHP_HAS_IPV6)
   set(HAVE_IPV6 TRUE)
   message(CHECK_PASS "yes")
 else()

cmake/cmake/modules/PHP/CheckSysMacros.cmake

@@ -72,7 +72,7 @@ include(PHP/CheckSysMacros)
 include_guard(GLOBAL)
 
 # Skip in consecutive configuration phases.
-if(DEFINED _PHP_HAVE_SYS_MACROS_CHECKED)
+if(PHP_HAS_SYS_MACROS_CHECKED)
   return()
 endif()
 
@@ -110,7 +110,7 @@ else()
 endif()
 
 set(
-  _PHP_HAVE_SYS_MACROS_CHECKED
+  PHP_HAS_SYS_MACROS_CHECKED
   TRUE
   CACHE INTERNAL
   "Internal marker whether 'major', 'minor' and 'makedev' have been checked."

cmake/cmake/platforms/Darwin.cmake

@@ -30,9 +30,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   check_linker_flag(
     C
     "LINKER:-undefined,dynamic_lookup"
-    HAVE_UNDEFINED_DYNAMIC_LOOKUP_FLAG_C
+    PHP_HAS_UNDEFINED_DYNAMIC_LOOKUP_FLAG_C
   )
-  if(HAVE_UNDEFINED_DYNAMIC_LOOKUP_FLAG_C)
+  if(PHP_HAS_UNDEFINED_DYNAMIC_LOOKUP_FLAG_C)
     target_link_options(
       php_config
       INTERFACE

cmake/ext/intl/CMakeLists.txt

@@ -166,17 +166,17 @@ target_sources(
     uchar/uchar.stub.php
 )
 
-php_check_compiler_flag(C -Wno-write-strings _PHP_HAVE_WNO_WRITE_STRINGS_C)
-if(_PHP_HAVE_WNO_WRITE_STRINGS_C)
+php_check_compiler_flag(C -Wno-write-strings PHP_HAS_WNO_WRITE_STRINGS_C)
+if(PHP_HAS_WNO_WRITE_STRINGS_C)
   target_compile_options(
     php_ext_intl
     PRIVATE
       $<$<COMPILE_LANGUAGE:C>:-Wno-write-strings>
   )
 endif()
 
-php_check_compiler_flag(CXX -Wno-write-strings _PHP_HAVE_WNO_WRITE_STRINGS_CXX)
-if(_PHP_HAVE_WNO_WRITE_STRINGS_CXX)
+php_check_compiler_flag(CXX -Wno-write-strings PHP_HAS_WNO_WRITE_STRINGS_CXX)
+if(PHP_HAS_WNO_WRITE_STRINGS_CXX)
   target_compile_options(
     php_ext_intl
     PRIVATE

cmake/ext/odbc/CMakeLists.txt

@@ -311,12 +311,15 @@ if(PHP_EXT_ODBC_TYPE STREQUAL "ibm-db2" AND TARGET ODBC::ODBC)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_LIBRARIES ODBC::ODBC)
     check_include_files(sqlcli1.h HAVE_SQLCLI1_H)
-    check_library_exists(ODBC::ODBC "" SQLExecute HAVE_SQLEXECUTE)
   cmake_pop_check_state()
+
   if(NOT HAVE_SQLCLI1_H)
     message(FATAL_ERROR "Required <sqlcli1.h> header file not found.")
   endif()
-  if(NOT HAVE_SQLEXECUTE)
+
+  check_library_exists(ODBC::ODBC "" SQLExecute PHP_EXT_ODBC_HAS_SQLEXECUTE)
+
+  if(NOT PHP_EXT_ODBC_HAS_SQLEXECUTE)
     message(
       FATAL_ERROR
       "ODBC build test failed. SQLExecute not found. The DB2 environment "