Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/CMakeLists.txt

@@ -468,35 +468,26 @@ endif()
 # Create files and set installation.
 ################################################################################
 
+# Run the Zend/zend_vm_gen.php script.
+#
 # On 32-bit targets the zend_vm_gen.php script outputs deprecation warnings. As
 # 32-bit targets are not considered development oriented environments, where the
 # files need to be regenerated, executing this script is skipped.
 # See: https://github.com/php/php-src/issues/15899
-if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
-  if(PHPSystem_EXECUTABLE)
-    set(PHP_EXECUTABLE ${PHPSystem_EXECUTABLE})
-  elseif(NOT CMAKE_CROSSCOMPILING)
-    set(PHP_EXECUTABLE "$<TARGET_FILE:php_cli>")
-  elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
-    set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:php_cli>")
-  endif()
-
-  if(PHP_EXECUTABLE)
-    # Run the Zend/zend_vm_gen.php script.
-    add_custom_command(
-      OUTPUT zend_vm
-      COMMAND ${PHP_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_gen.php
-      DEPENDS
-        php_cli
-        ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_execute.skl
-      COMMENT "[Zend] Regenerating zend_vm_execute.h and zend_vm_opcodes.{h,c}"
-      VERBATIM
-    )
-
-    add_custom_target(zend_generate_vm ALL DEPENDS zend_vm)
-
-    set_property(SOURCE zend_vm PROPERTY SYMBOLIC TRUE)
-  endif()
+if(PHPSystem_EXECUTABLE AND NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
+  add_custom_command(
+    OUTPUT
+      ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_execute.h
+      ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_opcodes.h
+      ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_opcodes.c
+    COMMAND ${PHPSystem_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_gen.php
+    DEPENDS
+      ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_execute.skl
+      ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_gen.php
+      ${CMAKE_CURRENT_SOURCE_DIR}/zend_vm_def.h
+    COMMENT "[Zend] Regenerating zend_vm_execute.h and zend_vm_opcodes.{h,c}"
+    VERBATIM
+  )
 endif()
 
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")

cmake/pear/CMakeLists.txt

@@ -57,17 +57,22 @@ else()
   message(CHECK_PASS "yes")
 endif()
 
-message(DEPRECATION "The PHP_PEAR option is deprecated.")
-
-if(NOT SAPI_CLI)
-  message(
-    FATAL_ERROR
-    "The PHP_PEAR option requires CLI SAPI. Please set SAPI_CLI to 'ON'."
-  )
-endif()
+message(
+  DEPRECATION
+  "The 'PHP_PEAR' option is deprecated and will be removed in future PHP "
+  "versions. PEAR can also be installed manually from the pear.php.net website."
+)
 
 # Check PEAR dependencies.
 block()
+  if(NOT SAPI_CLI)
+    message(
+      FATAL_ERROR
+      "The 'PHP_PEAR' option requires PHP CLI SAPI. Please, set 'SAPI_CLI' to "
+      "'ON'."
+    )
+  endif()
+
   foreach(
     extension
       openssl # For pecl command to download packages over https
@@ -77,8 +82,8 @@ block()
     if(NOT EXT_${extensionUpper})
       message(
         FATAL_ERROR
-        "PEAR requires PHP extension ${extension}. Set EXT_${extensionUpper} "
-        "to 'ON'."
+        "The 'PHP_PEAR' option requires PHP extension ${extension}. Please, "
+        "set 'EXT_${extensionUpper}' to 'ON'."
       )
     endif()
   endforeach()