Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/CMakeLists.txt

@@ -413,16 +413,15 @@ cmake_push_check_state(RESET)
   check_symbol_exists(mremap sys/mman.h HAVE_MREMAP)
 cmake_pop_check_state()
 
-# BSD-based systems have pthread_attr_get_np in pthread_np.h.
 block()
-  check_include_files(pthread_np.h _HAVE_PTHREAD_NP_H)
+  set(headers pthread.h)
 
-  if(_HAVE_PTHREAD_NP_H)
-    set(headers "pthread_np.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)
+    list(APPEND headers "pthread_np.h")
   endif()
 
-  list(APPEND headers pthread.h)
-
   check_symbol_exists(
     pthread_attr_get_np
     "${headers}"

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 _HAVE_FOPENCOOKIE)
+  check_symbol_exists(fopencookie stdio.h _PHP_HAVE_FOPENCOOKIE)
 cmake_pop_check_state()
 
-if(NOT _HAVE_FOPENCOOKIE)
+if(NOT _PHP_HAVE_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 _HAVE_GETHOSTBYNAME_R
+    VARIABLE _PHP_HAVE_GETHOSTBYNAME_R
     LIBRARY_VARIABLE library
   )
-  if(NOT _HAVE_GETHOSTBYNAME_R)
+  if(NOT _PHP_HAVE_GETHOSTBYNAME_R)
     message(CHECK_FAIL "not found")
     return()
   endif()

cmake/cmake/modules/PHP/CheckSegmentsAlignment.cmake

@@ -13,7 +13,6 @@ include(PHP/CheckSegmentsAlignment)
 
 include_guard(GLOBAL)
 
-include(CheckLinkerFlag)
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 
@@ -30,129 +29,105 @@ if(
   return()
 endif()
 
-check_linker_flag(
-  C
-  "LINKER:-z,common-page-size=2097152;LINKER:-z,max-page-size=2097152"
-  _HAVE_ALIGNMENT_FLAGS_C
-)
+cmake_push_check_state(RESET)
+  set(
+    CMAKE_REQUIRED_LINK_OPTIONS
+    LINKER:-z,common-page-size=2097152
+    LINKER:-z,max-page-size=2097152
+  )
+  set(CMAKE_REQUIRED_QUIET TRUE)
 
-if(_HAVE_ALIGNMENT_FLAGS_C)
+  check_source_runs(
+    C
+    [[int main(void) { return 0; }]]
+    PHP_HAVE_ALIGNMENT_FLAGS_C
+  )
+cmake_pop_check_state()
+
+if(PHP_HAVE_ALIGNMENT_FLAGS_C)
+  target_link_options(
+    php_config
+    INTERFACE
+      $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>,$<LINK_LANGUAGE:ASM,C>>:LINKER:-z,common-page-size=2097152;LINKER:-z,max-page-size=2097152>
+  )
+else()
   cmake_push_check_state(RESET)
     set(
       CMAKE_REQUIRED_LINK_OPTIONS
-      LINKER:-z,common-page-size=2097152
       LINKER:-z,max-page-size=2097152
     )
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
     check_source_runs(
       C
       [[int main(void) { return 0; }]]
-      PHP_HAVE_ALIGNMENT_FLAGS_C
+      PHP_HAVE_MAX_PAGE_SIZE_C
     )
   cmake_pop_check_state()
 
-  if(PHP_HAVE_ALIGNMENT_FLAGS_C)
+  if(PHP_HAVE_MAX_PAGE_SIZE_C)
     target_link_options(
       php_config
       INTERFACE
-        $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>,$<LINK_LANGUAGE:ASM,C>>:LINKER:-z,common-page-size=2097152;LINKER:-z,max-page-size=2097152>
+        $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>,$<LINK_LANGUAGE:ASM,C>>:LINKER:-z,max-page-size=2097152>
     )
   endif()
-else()
-  check_linker_flag(
-    C
-    "LINKER:-z,max-page-size=2097152"
-    _HAVE_ZMAX_PAGE_SIZE_C
-  )
-
-  if(_HAVE_ZMAX_PAGE_SIZE_C)
-    cmake_push_check_state(RESET)
-      set(
-        CMAKE_REQUIRED_LINK_OPTIONS
-        LINKER:-z,max-page-size=2097152
-      )
-      check_source_runs(
-        C
-        [[int main(void) { return 0; }]]
-        PHP_HAVE_ZMAX_PAGE_SIZE_C
-      )
-    cmake_pop_check_state()
-
-    if(PHP_HAVE_ZMAX_PAGE_SIZE_C)
-      target_link_options(
-        php_config
-        INTERFACE
-          $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>,$<LINK_LANGUAGE:ASM,C>>:LINKER:-z,max-page-size=2097152>
-      )
-    endif()
-  endif()
 endif()
 
 get_property(enabledLanguages GLOBAL PROPERTY ENABLED_LANGUAGES)
 
 if(CXX IN_LIST enabledLanguages)
-  check_linker_flag(
-    CXX
-    "LINKER:-z,common-page-size=2097152;LINKER:-z,max-page-size=2097152"
-    _HAVE_ALIGNMENT_FLAGS_CXX
-  )
+  cmake_push_check_state(RESET)
+    set(
+      CMAKE_REQUIRED_LINK_OPTIONS
+      LINKER:-z,common-page-size=2097152
+      LINKER:-z,max-page-size=2097152
+    )
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_source_runs(
+      CXX
+      [[int main(void) { return 0; }]]
+      PHP_HAVE_ALIGNMENT_FLAGS_CXX
+    )
+  cmake_pop_check_state()
 
-  if(_HAVE_ALIGNMENT_FLAGS_CXX)
+  if(PHP_HAVE_ALIGNMENT_FLAGS_CXX)
+    target_link_options(
+      php_config
+      INTERFACE
+        $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>,$<LINK_LANGUAGE:CXX>>:LINKER:-z,common-page-size=2097152;LINKER:-z,max-page-size=2097152;>
+    )
+  else()
     cmake_push_check_state(RESET)
       set(
         CMAKE_REQUIRED_LINK_OPTIONS
-        LINKER:-z,common-page-size=2097152
         LINKER:-z,max-page-size=2097152
       )
+      set(CMAKE_REQUIRED_QUIET TRUE)
+
       check_source_runs(
         CXX
         [[int main(void) { return 0; }]]
-        PHP_HAVE_ALIGNMENT_FLAGS_CXX
+        PHP_HAVE_MAX_PAGE_SIZE_CXX
       )
     cmake_pop_check_state()
 
-    if(PHP_HAVE_ALIGNMENT_FLAGS_CXX)
+    if(PHP_HAVE_MAX_PAGE_SIZE_CXX)
       target_link_options(
         php_config
         INTERFACE
-          $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>,$<LINK_LANGUAGE:CXX>>:LINKER:-z,common-page-size=2097152;LINKER:-z,max-page-size=2097152;>
+          $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>,$<LINK_LANGUAGE:CXX>>:LINKER:-z,max-page-size=2097152>
       )
     endif()
-  else()
-    check_linker_flag(
-      CXX
-      "LINKER:-z,max-page-size=2097152"
-      _HAVE_ZMAX_PAGE_SIZE_CXX
-    )
-
-    if(_HAVE_ZMAX_PAGE_SIZE_CXX)
-      cmake_push_check_state(RESET)
-        set(
-          CMAKE_REQUIRED_LINK_OPTIONS
-          LINKER:-z,max-page-size=2097152
-        )
-        check_source_runs(
-          CXX
-          [[int main(void) { return 0; }]]
-          PHP_HAVE_ZMAX_PAGE_SIZE_CXX
-        )
-      cmake_pop_check_state()
-
-      if(PHP_HAVE_ZMAX_PAGE_SIZE_CXX)
-        target_link_options(
-          php_config
-          INTERFACE
-            $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>,$<LINK_LANGUAGE:CXX>>:LINKER:-z,max-page-size=2097152>
-        )
-      endif()
-    endif()
   endif()
 endif()
 
 if(
   PHP_HAVE_ALIGNMENT_FLAGS_C
   OR PHP_HAVE_ALIGNMENT_FLAGS_CXX
-  OR PHP_HAVE_ZMAX_PAGE_SIZE_C
-  OR PHP_HAVE_ZMAX_PAGE_SIZE_CXX
+  OR PHP_HAVE_MAX_PAGE_SIZE_C
+  OR PHP_HAVE_MAX_PAGE_SIZE_CXX
 )
   message(CHECK_PASS "done")
 else()

cmake/cmake/toolchains/template.cmake

@@ -25,9 +25,9 @@ set(HAVE_GETADDRINFO_EXITCODE 0)
 # Set the exit codes for the alignment segments checks.
 # See PHP/CheckSegmentsAlignment.cmake
 set(PHP_HAVE_ALIGNMENT_FLAGS_C_EXITCODE 0)
-set(PHP_HAVE_ZMAX_PAGE_SIZE_C_EXITCODE 0)
+set(PHP_HAVE_MAX_PAGE_SIZE_C_EXITCODE 0)
 set(PHP_HAVE_ALIGNMENT_FLAGS_CXX_EXITCODE 0)
-set(PHP_HAVE_ZMAX_PAGE_SIZE_CXX_EXITCODE 0)
+set(PHP_HAVE_MAX_PAGE_SIZE_CXX_EXITCODE 0)
 
 # Set the exit code for check of GNU C compiler with broken strlen optimization
 # (relevant only for GCC version 8.2).

cmake/ext/curl/CMakeLists.txt

@@ -83,6 +83,14 @@ set_package_properties(
     PURPOSE "Necessary to enable the curl extension."
 )
 
+target_compile_options(
+  php_ext_curl
+  PRIVATE
+    $<$<PLATFORM_ID:Windows>:PHP_CURL_EXPORTS>
+    # TODO: Add CURL_STATICLIB when curl is static library on Windows:
+    $<$<AND:$<PLATFORM_ID:Windows>,$<BOOL:${TODO}>>:CURL_STATICLIB>
+)
+
 target_link_libraries(php_ext_curl PRIVATE CURL::libcurl)
 
 # Check whether to link against OpenSSL to have crypto locking callbacks when

cmake/ext/opcache/cmake/CheckSHM.cmake

@@ -216,11 +216,11 @@ php_search_libraries(
   HEADERS sys/mman.h
   LIBRARIES
     rt # Solaris <= 10, older Linux
-  VARIABLE _HAVE_SHM_OPEN
+  VARIABLE _PHP_HAVE_SHM_OPEN
   LIBRARY_VARIABLE libraryForShmOpen
 )
 
-if(_HAVE_SHM_OPEN)
+if(_PHP_HAVE_SHM_OPEN)
   cmake_push_check_state(RESET)
     if(libraryForShmOpen)
       set(CMAKE_REQUIRED_LIBRARIES ${libraryForShmOpen})

cmake/ext/pcre/CMakeLists.txt

@@ -232,12 +232,12 @@ else()
     message(CHECK_START "Checking whether Intel CET is enabled")
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_QUIET TRUE)
-      check_symbol_exists(__CET__ "" _HAVE_PCRE2_INTEL_CET)
+      check_symbol_exists(__CET__ "" _PHP_HAVE_PCRE2_INTEL_CET)
     cmake_pop_check_state()
-    if(_HAVE_PCRE2_INTEL_CET)
+    if(_PHP_HAVE_PCRE2_INTEL_CET)
       message(CHECK_PASS "yes")
-      php_check_compiler_flag(C -mshstk _HAVE_MSHSTK_C)
-      if(_HAVE_MSHSTK_C)
+      php_check_compiler_flag(C -mshstk _PHP_HAVE_MSHSTK_C)
+      if(_PHP_HAVE_MSHSTK_C)
         target_compile_options(php_ext_pcre PRIVATE -mshstk)
       endif()
     else()

cmake/ext/pdo_odbc/CMakeLists.txt

@@ -221,19 +221,19 @@ if(TARGET ODBC::ODBC)
   endblock()
 
   # Check for an ODBC 1.0 function to assert that the libraries work.
-  check_library_exists(ODBC::ODBC SQLBindCol "" _HAVE_SQLBINDCOL)
+  check_library_exists(ODBC::ODBC SQLBindCol "" _PHP_HAVE_SQLBINDCOL)
 
-  if(NOT _HAVE_SQLBINDCOL)
+  if(NOT _PHP_HAVE_SQLBINDCOL)
     message(
       FATAL_ERROR
       "Could not find the SQLBindCol ODBC 1.0 function in the ODBC library."
     )
   endif()
 
   # Check for an ODBC 3.0 function to assert that the libraries work.
-  check_library_exists(ODBC::ODBC SQLAllocHandle "" _HAVE_SQLALLOCHANDLE)
+  check_library_exists(ODBC::ODBC SQLAllocHandle "" _PHP_HAVE_SQLALLOCHANDLE)
 
-  if(NOT _HAVE_SQLALLOCHANDLE)
+  if(NOT _PHP_HAVE_SQLALLOCHANDLE)
     message(
       FATAL_ERROR
       "The ODBC library does not appear to be ODBC 3 compatible (the ODBC 3.0 "

cmake/ext/posix/CMakeLists.txt

@@ -34,6 +34,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   return()
 endif()
 
+include(CheckIncludeFiles)
 include(CheckStructHasMember)
 include(CheckSymbolExists)
 include(CMakeDependentOption)
@@ -86,14 +87,16 @@ check_symbol_exists(getpgid unistd.h HAVE_GETPGID)
 check_symbol_exists(getrlimit sys/resource.h HAVE_GETRLIMIT)
 check_symbol_exists(getsid unistd.h HAVE_GETSID)
 
-# BSD-based systems have initgroups in unistd.h but still have grp.h file.
+# BSD-based systems have initgroups in unistd.h, elsewhere it is in grp.h.
 block()
   set(headers "")
 
+  check_include_files(grp.h HAVE_GRP_H)
   if(HAVE_GRP_H)
     list(APPEND headers "grp.h")
   endif()
 
+  check_include_files(unistd.h HAVE_UNISTD_H)
   if(HAVE_UNISTD_H)
     list(APPEND headers "unistd.h")
   endif()