Merge branch 'PHP-8.4'

Author: petk

cmake/ext/fileinfo/CMakeLists.txt

@@ -62,6 +62,9 @@ target_sources(
     php_libmagic.c
 )
 
+# Check for major, minor, and makedev.
+include(PHP/CheckSysMacros)
+
 # The strcasestr is missing on Windows and Solaris <= 10 (Solaris 11 has it).
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)

cmake/ext/fileinfo/config.cmake.h.in

@@ -7,5 +7,16 @@
 /* Define to 1 if you have the 'strndup' function. */
 #cmakedefine HAVE_STRNDUP 1
 
+/* Define to 1 if you have the <sys/sysmacros.h> header file. */
+#cmakedefine HAVE_SYS_SYSMACROS_H 1
+
 /* Define to 1 if you have the 'utimes' function. */
 #cmakedefine HAVE_UTIMES 1
+
+/* Define to 1 if 'major', 'minor', and 'makedev' are declared in <mkdev.h>.
+   */
+#cmakedefine MAJOR_IN_MKDEV 1
+
+/* Define to 1 if 'major', 'minor', and 'makedev' are declared in
+   <sysmacros.h>. */
+#cmakedefine MAJOR_IN_SYSMACROS 1

cmake/ext/pdo_mysql/config.cmake.h.in

@@ -1,9 +1,9 @@
-/* The MySQL Unix socket location. */
-#cmakedefine PHP_MYSQL_UNIX_SOCK_ADDR "@PHP_MYSQL_UNIX_SOCK_ADDR@"
-
 /* The MySQL Unix socket location as defined by 'mysql_config' for use with
    the pdo_mysql extension. */
 #cmakedefine PDO_MYSQL_UNIX_ADDR "@PDO_MYSQL_UNIX_ADDR@"
 
 /* Define to 1 if the pdo_mysql extension uses mysqlnd. */
 #cmakedefine PDO_USE_MYSQLND 1
+
+/* The MySQL Unix socket location. */
+#cmakedefine PHP_MYSQL_UNIX_SOCK_ADDR "@PHP_MYSQL_UNIX_SOCK_ADDR@"

cmake/ext/posix/CMakeLists.txt

@@ -90,6 +90,9 @@ check_symbol_exists(seteuid "unistd.h" HAVE_SETEUID)
 check_symbol_exists(setrlimit "sys/resource.h" HAVE_SETRLIMIT)
 check_symbol_exists(setsid "unistd.h" HAVE_SETSID)
 
+# Check for major, minor, and makedev.
+include(PHP/CheckSysMacros)
+
 include(PHP/CheckTtynameR)
 
 cmake_push_check_state(RESET)

cmake/ext/posix/config.cmake.h.in

@@ -25,6 +25,9 @@
 /* Define to 1 if you have the 'initgroups' function. */
 #cmakedefine HAVE_INITGROUPS 1
 
+/* Define to 1 if you have the 'makedev' function. */
+#cmakedefine HAVE_MAKEDEV 1
+
 /* Define to 1 if you have the 'mkfifo' function. */
 #cmakedefine HAVE_MKFIFO 1
 
@@ -54,3 +57,11 @@
 
 /* Define to 1 if you have a working 'ttyname_r' function. */
 #cmakedefine HAVE_TTYNAME_R 1
+
+/* Define to 1 if 'major', 'minor', and 'makedev' are declared in <mkdev.h>.
+   */
+#cmakedefine MAJOR_IN_MKDEV 1
+
+/* Define to 1 if 'major', 'minor', and 'makedev' are declared in
+   <sysmacros.h>. */
+#cmakedefine MAJOR_IN_SYSMACROS 1

cmake/main/php_config.cmake.h.in

@@ -285,9 +285,6 @@
 /* Define to 1 if you have the 'mach_vm_read' function. */
 #cmakedefine HAVE_MACH_VM_READ 1
 
-/* Define to 1 if you have the 'makedev' function. */
-#cmakedefine HAVE_MAKEDEV 1
-
 /* Define to 1 if you have the 'memcntl' function. */
 #cmakedefine HAVE_MEMCNTL 1
 
@@ -528,9 +525,6 @@
 /* Define to 1 if you have the <sys/sysexits.h> header file. */
 #cmakedefine HAVE_SYS_SYSEXITS_H 1
 
-/* Define to 1 if you have the <sys/sysmacros.h> header file. */
-#cmakedefine HAVE_SYS_SYSMACROS_H 1
-
 /* Define to 1 if you have the <sys/time.h> header file. */
 #cmakedefine HAVE_SYS_TIME_H 1
 
@@ -595,14 +589,6 @@
 /* Define to 1 if you have the <wmmintrin.h> header file. */
 #cmakedefine HAVE_WMMINTRIN_H 1
 
-/* Define to 1 if 'major', 'minor', and 'makedev' are declared in <mkdev.h>.
-   */
-#cmakedefine MAJOR_IN_MKDEV 1
-
-/* Define to 1 if 'major', 'minor', and 'makedev' are declared in
-   <sysmacros.h>. */
-#cmakedefine MAJOR_IN_SYSMACROS 1
-
 /* Define to 1 if 'asctime_r' declaration is missing. */
 #cmakedefine MISSING_ASCTIME_R_DECL 1