Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

bin/init.sh

@@ -82,8 +82,8 @@ done
 # Check requirements.
 which=$(which which 2>/dev/null)
 cmake=$(which cmake 2>/dev/null)
-patch=$(which patch 2>/dev/null)
 git=$(which git 2>/dev/null)
+patch=$(which patch 2>/dev/null)
 
 if test -z "$which"; then
   echo "init.sh: The 'which' command not found." >&2
@@ -98,22 +98,22 @@ if test -z "$cmake"; then
   echo "" >&2
 fi
 
-if test -z "$patch"; then
-  echo "init.sh: The 'patch' command not found." >&2
-  echo "         Please install patch utilities:" >&2
-  echo "         http://savannah.gnu.org/projects/patch" >&2
-  echo "" >&2
-fi
-
 if test -z "$git"; then
   echo "init.sh: The 'git' command not found." >&2
   echo "         Please install Git:" >&2
   echo "         https://git-scm.com" >&2
   echo "" >&2
 fi
 
+if test -z "$patch"; then
+  echo "init.sh: The 'patch' command not found." >&2
+  echo "         Instead, the 'git' command will be used to apply patches." >&2
+  echo "         Optionally install patch utilities:" >&2
+  echo "         http://savannah.gnu.org/projects/patch" >&2
+  echo "" >&2
+fi
+
 if test -z "${cmake}" \
-  || test -z "${patch}" \
   || test -z "${git}"
 then
   exit 1
@@ -196,8 +196,12 @@ fi
 for file in $patches; do
   case $file in
     *.patch)
-      "$patch" -p1 -d php-src < $file
-      ;;
+      if test -n "$patch"; then
+        "$patch" -p1 -d php-src < $file
+      else
+        "$git" apply $file --directory php-src
+      fi
+    ;;
   esac
 done
 

cmake/ext/skeleton/cmake/modules/FindPHP.cmake

@@ -286,7 +286,7 @@ endif()
 set(PHP_LIBRARIES ${PHP_EMBED_LIBRARY})
 
 if(NOT TARGET PHP::PHP)
-  add_library(PHP::PHP UNKNOWN IMPORTED)
+  add_library(PHP::PHP INTERFACE IMPORTED)
 
   set_target_properties(
     PHP::PHP

cmake/main/config.w32.cmake.h.in

@@ -242,9 +242,6 @@
 /* Define to 1 if the PHP extension 'zlib' is built as a dynamic module. */
 #cmakedefine COMPILE_DL_ZLIB 1
 
-/* Configure line */
-#cmakedefine CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
-
 /* Define to 1 if fopencookie seeker uses off64_t. */
 #cmakedefine COOKIE_SEEKER_USES_OFF64_T 1
 
@@ -1792,11 +1789,6 @@
 /* Define to 1 if the pdo_mysql extension uses mysqlnd. */
 #cmakedefine PDO_USE_MYSQLND 1
 
-/* The PEAR installation directory. */
-#define PEAR_INSTALLDIR "@PREFIX@\\pear"
-
-#define PHP_BINDIR "@PREFIX@"
-
 /* The build architecture. */
 #cmakedefine PHP_BUILD_ARCH "@PHP_BUILD_ARCH@"
 
@@ -1815,15 +1807,6 @@
 /* Compiler identification string. */
 #cmakedefine PHP_COMPILER_ID "@PHP_COMPILER_ID@"
 
-/* The path in which to look for php.ini. */
-#define PHP_CONFIG_FILE_PATH ""
-
-#define PHP_CONFIG_FILE_SCAN_DIR "@PHP_FULL_CONFIG_FILE_SCAN_DIR@"
-
-#define PHP_DATADIR "@PREFIX@"
-
-#define PHP_EXTENSION_DIR "@PREFIX@\\ext"
-
 /* Define to 1 if the compiler supports AVX-512. */
 #cmakedefine PHP_HAVE_AVX512_SUPPORTS 1
 
@@ -1887,21 +1870,15 @@
 /* The iconv implementation. */
 #cmakedefine PHP_ICONV_IMPL "@PHP_ICONV_IMPL@"
 
-#define PHP_INCLUDE_PATH ".;@PREFIX@\\pear"
-
 /* Define to 1 you have IRIX-style reentrant time functions. */
 #cmakedefine PHP_IRIX_TIME_R 1
 
-#define PHP_LIBDIR "@PREFIX@"
-
 /* Linker major version. */
 #cmakedefine PHP_LINKER_MAJOR @PHP_LINKER_MAJOR@
 
 /* Linker minor version. */
 #cmakedefine PHP_LINKER_MINOR @PHP_LINKER_MINOR@
 
-#define PHP_LOCALSTATEDIR "@PREFIX@"
-
 /* Define to 1 if mhash support is enabled. */
 #cmakedefine PHP_MHASH_BC 1
 
@@ -1914,24 +1891,15 @@
 /* The 'uname' output. */
 #define PHP_OS "@CMAKE_SYSTEM_NAME@"
 
-#define PHP_PREFIX "@PREFIX@"
-
-#define PHP_SBINDIR "@PREFIX@"
-
 /* Define to 1 if 'pread' declaration with 'off64_t' is missing. */
 #cmakedefine PHP_PREAD_64 1
 
 /* Define to 1 if 'pwrite' declaration with 'off64_t' is missing. */
 #cmakedefine PHP_PWRITE_64 1
 
-#define PHP_SHLIB_EXT_PREFIX "php_"
-#define PHP_SHLIB_SUFFIX "dll"
-
 /* Define to 1 if PHP uses its own SIGCHLD handler, and to 0 if not. */
 #cmakedefine01 PHP_SIGCHILD
 
-#define PHP_SYSCONFDIR "@PREFIX@"
-
 /* The 'uname -a' output. */
 #cmakedefine PHP_UNAME "@PHP_UNAME@"
 
@@ -2035,7 +2003,8 @@
 /* Define to 1 if Zend signal handling is supported and enabled. */
 #cmakedefine ZEND_SIGNALS 1
 
-/* */
+/* Define to 1 if libzip is built statically on Windows. Required for static
+   libzip since version 1.0 to 1.3.2. */
 #cmakedefine ZIP_STATIC 1
 
 /* Define to 1 if thread safety (ZTS) is enabled. */
@@ -2044,6 +2013,52 @@
 /* Define to 1 when using musl libc. */
 #cmakedefine __MUSL__ 1
 
+/* The following build system related configuration values are on *nix
+   systems defined in the main/build-defs.h and JScript Windows build system
+   defines them in the configuration header file. */
+
+/* Configure line */
+#cmakedefine CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
+
+/* The PEAR installation directory. */
+#define PEAR_INSTALLDIR "@PREFIX@\\pear"
+
+/* The path to the bin directory. */
+#define PHP_BINDIR "@PREFIX@"
+
+/* The path in which to look for php.ini. */
+#define PHP_CONFIG_FILE_PATH ""
+
+/* The path where to scan for additional INI configuration files. */
+#define PHP_CONFIG_FILE_SCAN_DIR "@PHP_FULL_CONFIG_FILE_SCAN_DIR@"
+
+/* The path to the share directory. */
+#define PHP_DATADIR "@PREFIX@"
+
+/* Default directory for dynamically loadable PHP extensions. */
+#define PHP_EXTENSION_DIR "@PREFIX@\\ext"
+
+/* The 'include_path' PHP INI directive. */
+#define PHP_INCLUDE_PATH ".;@PREFIX@\\pear"
+
+/* The path containing system libraries (lib or lib64). */
+#define PHP_LIBDIR "@PREFIX@"
+
+/* The path to the var directory. */
+#define PHP_LOCALSTATEDIR "@PREFIX@"
+
+/* The installation prefix. */
+#define PHP_PREFIX "@PREFIX@"
+
+/* The prefix for the shared library objects. */
+#define PHP_SHLIB_EXT_PREFIX "php_"
+
+/* The shared library objects extension. */
+#define PHP_SHLIB_SUFFIX "dll"
+
+/* The path to the etc directory. */
+#define PHP_SYSCONFDIR "@PREFIX@"
+
 #if __has_include("main/config.pickle.h")
 #include "main/config.pickle.h"
 #endif

cmake/main/php_config.cmake.h.in

@@ -2001,7 +2001,8 @@
 /* Define to 1 if Zend signal handling is supported and enabled. */
 #cmakedefine ZEND_SIGNALS 1
 
-/* */
+/* Define to 1 if libzip is built statically on Windows. Required for static
+   libzip since version 1.0 to 1.3.2. */
 #cmakedefine ZIP_STATIC 1
 
 /* Define to 1 if thread safety (ZTS) is enabled. */