Fix nits

petk · petk · commit adaefe5c3070 · 2024-11-24T23:17:38.000+01:00
diff --git a/cmake/Zend/cmake/CheckDlsym.cmake b/cmake/Zend/cmake/CheckDlsym.cmake
@@ -1,13 +1,16 @@
 #[=============================================================================[
+# CheckDlsym
+
 Check if `dlsym()` requires a leading underscore in symbol name.
 
 Some non-ELF platforms, such as OpenBSD, FreeBSD, NetBSD, Mac OSX (~10.3),
 needed underscore character (`_`) prefix for symbols, when using `dlsym()`. This
 module is obsolete on current platforms.
 
-## Cache variables
+## Result variables
 
 * `DLSYM_NEEDS_UNDERSCORE`
+
   Whether `dlsym()` requires a leading underscore in symbol names.
 #]=============================================================================]
 
@@ -110,14 +113,7 @@ block()
 endblock()
 
 if(DLSYM_NEEDS_UNDERSCORE_COMPILED AND DLSYM_NEEDS_UNDERSCORE_EXITCODE EQUAL 2)
-  set(
-    DLSYM_NEEDS_UNDERSCORE 1
-    CACHE INTERNAL
-    "Whether dlsym() requires a leading underscore in symbol names."
-  )
-endif()
-
-if(DLSYM_NEEDS_UNDERSCORE)
+  set(DLSYM_NEEDS_UNDERSCORE TRUE)
   message(CHECK_PASS "yes")
 else()
   message(CHECK_FAIL "no")
diff --git a/cmake/Zend/cmake/CheckFloatPrecision.cmake b/cmake/Zend/cmake/CheckFloatPrecision.cmake
@@ -1,19 +1,30 @@
 #[=============================================================================[
+# CheckFloatPrecision
+
 Check for x87 floating point internal precision control.
 
 See: https://wiki.php.net/rfc/rounding
 
 ## Cache variables
 
 * `HAVE__FPU_SETCW`
+
   Whether `_FPU_SETCW` is usable.
+
 * `HAVE_FPSETPREC`
+
   Whether `fpsetprec` is present and usable.
+
 * `HAVE__CONTROLFP`
+
   Whether `_controlfp` is present and usable.
+
 * `HAVE__CONTROLFP_S`
+
   Whether `_controlfp_s` is present and usable.
+
 * `HAVE_FPU_INLINE_ASM_X86`
+
   Whether FPU control word can be manipulated by inline assembler.
 #]=============================================================================]
 
diff --git a/cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake b/cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake
@@ -1,4 +1,6 @@
 #[=============================================================================[
+# CheckGlobalRegisterVariables
+
 Check whether the compiler and target system support global register variables.
 
 Global register variables are relevant for the GNU C compatible compilers.
diff --git a/cmake/Zend/cmake/CheckMMAlignment.cmake b/cmake/Zend/cmake/CheckMMAlignment.cmake
@@ -1,8 +1,10 @@
 #[=============================================================================[
+# CheckMMAlignment
+
 Test and set the alignment defines for the Zend memory manager (`ZEND_MM`). This
 also does the logarithmic test.
 
-## Cache variables
+## Result variables
 
 * `ZEND_MM_ALIGNMENT`
 * `ZEND_MM_ALIGNMENT_LOG2`
@@ -23,7 +25,12 @@ if(
   set(ZEND_MM_EXITCODE__TRYRUN_OUTPUT "(size_t)8 (size_t)3 0")
 endif()
 
-block()
+block(
+  PROPAGATE
+    ZEND_MM_ALIGNMENT
+    ZEND_MM_ALIGNMENT_LOG2
+    ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
+)
   try_run(
     ZEND_MM_EXITCODE
     ZEND_MM_COMPILED
@@ -82,21 +89,13 @@ block()
       "ZEND_MM alignment defines failed. Please, check CMake logs.")
   endif()
 
-  set(
-    ZEND_MM_ALIGNMENT ${zend_mm_alignment}
-    CACHE INTERNAL "Alignment for Zend memory allocator"
-  )
-  set(
-    ZEND_MM_ALIGNMENT_LOG2 ${zend_mm_alignment_log2}
-    CACHE INTERNAL "Alignment for Zend memory allocator log2"
-  )
-  set(
-    ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT ${zend_mm_need_eight_byte_realignment}
-    CACHE INTERNAL "Whether 8-byte realignment is needed"
-  )
+  set(ZEND_MM_ALIGNMENT ${zend_mm_alignment})
+  set(ZEND_MM_ALIGNMENT_LOG2 ${zend_mm_alignment_log2})
+  set(ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT ${zend_mm_need_eight_byte_realignment})
 endblock()
 
-message(VERBOSE
+message(
+  VERBOSE
   "MM alignment values:\n"
   "    ZEND_MM_ALIGNMENT=${ZEND_MM_ALIGNMENT}\n"
   "    ZEND_MM_ALIGNMENT_LOG2=${ZEND_MM_ALIGNMENT_LOG2}\n"
diff --git a/cmake/Zend/cmake/CheckStackLimit.cmake b/cmake/Zend/cmake/CheckStackLimit.cmake
@@ -1,9 +1,12 @@
 #[=============================================================================[
+# CheckStackLimit
+
 Check whether the stack grows downwards. Assumes contiguous stack.
 
 ## Cache variables
 
-* `ZEND_CHECK_STACK_LIMIT`
+* `ZEND_CHECK_STACK_LIMIT
+
   Whether checking the stack limit is supported.
 #]=============================================================================]
 
diff --git a/cmake/Zend/cmake/CheckStrerrorR.cmake b/cmake/Zend/cmake/CheckStrerrorR.cmake
@@ -1,12 +1,17 @@
 #[=============================================================================[
+# CheckStrerrorR
+
 Check for `strerror_r()`, and if its a POSIX-compatible or a GNU-specific
 version.
 
 ## Cache variables
 
 * `HAVE_STRERROR_R`
+
   Whether `strerror_r()` is available.
+
 * `STRERROR_R_CHAR_P`
+
   Whether `strerror_r()` returns a `char *` message, otherwise it returns an
   `int` error number.
 #]=============================================================================]
diff --git a/cmake/Zend/cmake/Fibers.cmake b/cmake/Zend/cmake/Fibers.cmake
@@ -1,4 +1,6 @@
 #[=============================================================================[
+# Fibers
+
 Check if Fibers can be used.
 
 This module adds Boost fiber assembly files support if available for the
diff --git a/cmake/Zend/cmake/MaxExecutionTimers.cmake b/cmake/Zend/cmake/MaxExecutionTimers.cmake
@@ -1,4 +1,6 @@
 #[=============================================================================[
+# MaxExecutionTimers
+
 Check whether to enable Zend max execution timers.
 
 ## Cache variables
diff --git a/cmake/cmake/modules/FindCclient.cmake b/cmake/cmake/modules/FindCclient.cmake
@@ -16,14 +16,14 @@ Module defines the following `IMPORTED` target(s):
 * `Cclient_FOUND` - Whether the package has been found.
 * `Cclient_INCLUDE_DIRS` - Include directories needed to use this package.
 * `Cclient_LIBRARIES` - Libraries needed to link to the package library.
+* `HAVE_IMAP2000` - Whether c-client version is 2000 or newer. If true,
+  c-client.h should be included instead of only rfc822.h on prior versions.
+* `HAVE_IMAP2001` - Whether c-client version is 2001 to 2004.
 
 ## Cache variables
 
 * `Cclient_INCLUDE_DIR` - Directory containing package library headers.
 * `Cclient_LIBRARY` - The path to the package library.
-* `HAVE_IMAP2000` - Whether c-client version is 2000 or newer. If true,
-  c-client.h should be included instead of only rfc822.h on prior versions.
-* `HAVE_IMAP2001` - Whether c-client version is 2001 to 2004.
 * `HAVE_IMAP2004` - Whether c-client version is 2004 or newer.
 * `HAVE_NEW_MIME2TEXT` - Whether utf8_mime2text() has new signature.
 * `HAVE_RFC822_OUTPUT_ADDRESS_LIST` - Whether function
@@ -357,10 +357,7 @@ endif()
 
 # Check whether c-client version is 2000 or newer.
 if(EXISTS ${Cclient_INCLUDE_DIR}/c-client.h)
-  set(
-    HAVE_IMAP2000 1
-    CACHE INTERNAL "Whether c-client version is 2000 or newer"
-  )
+  set(HAVE_IMAP2000 TRUE)
 endif()
 
 block()
@@ -378,10 +375,7 @@ block()
 
   if(imapsslport_results)
     message(CHECK_PASS "yes")
-    set(
-      HAVE_IMAP2001 1
-      CACHE INTERNAL "Whether c-client version is 2001 to 2004"
-    )
+    set(HAVE_IMAP2001 TRUE)
   else()
     message(CHECK_FAIL "no")
   endif()
diff --git a/cmake/cmake/modules/FindSendmail.cmake b/cmake/cmake/modules/FindSendmail.cmake
@@ -8,7 +8,7 @@ either `sendmail` is used if found, or a general default value is set to
 
 ## Result variables
 
-* `Sendmail_FOUND` - Whether mailer has been found.
+* `Sendmail_FOUND` - Whether sendmail has been found.
 * `PROG_SENDMAIL` - Path to the sendmail executable program, either found by
   the module or set to a sensible default value.
 
diff --git a/cmake/cmake/modules/PHP/CheckByteOrder.cmake b/cmake/cmake/modules/PHP/CheckByteOrder.cmake
@@ -16,7 +16,7 @@ message(CHECK_START "Checking byte ordering")
 
 if(CMAKE_C_BYTE_ORDER STREQUAL "BIG_ENDIAN")
   message(CHECK_PASS "big-endian")
-  set(WORDS_BIGENDIAN 1 CACHE INTERNAL "Whether byte ordering is big-endian.")
+  set(WORDS_BIGENDIAN TRUE CACHE INTERNAL "Whether byte ordering is big-endian.")
 elseif(CMAKE_C_BYTE_ORDER STREQUAL "LITTLE_ENDIAN")
   message(CHECK_PASS "little-endian")
 else()
diff --git a/cmake/cmake/modules/PHP/CheckGethostbynameR.cmake b/cmake/cmake/modules/PHP/CheckGethostbynameR.cmake
@@ -17,18 +17,18 @@ https://www.gnu.org/software/autoconf-archive/ax_func_which_gethostbyname_r.html
 
 ## Cache variables
 
-* `HAVE_GETHOSTBYNAME_R`
-  Whether `gethostbyname_r()` is available.
-* `HAVE_FUNC_GETHOSTBYNAME_R_6`
-  Whether `gethostbyname_r()` has 6 arguments.
-* `HAVE_FUNC_GETHOSTBYNAME_R_5`
-  Whether `gethostbyname_r()` has 5 arguments.
-* `HAVE_FUNC_GETHOSTBYNAME_R_3`
-  Whether `gethostbyname_r()` has 3 arguments.
+* `HAVE_FUNC_GETHOSTBYNAME_R_6` - Whether `gethostbyname_r()` has 6 arguments.
+* `HAVE_FUNC_GETHOSTBYNAME_R_5` - Whether `gethostbyname_r()` has 5 arguments.
+* `HAVE_FUNC_GETHOSTBYNAME_R_3`- Whether `gethostbyname_r()` has 3 arguments.
+
+## Result variables
+
+* `HAVE_GETHOSTBYNAME_R`- Whether `gethostbyname_r()` is available.
 
 INTERFACE library:
 
 * `PHP::CheckGethostbynameR`
+
   Created when additional system library needs to be linked.
 #]=============================================================================]
 
@@ -117,8 +117,5 @@ if(
   OR HAVE_FUNC_GETHOSTBYNAME_R_5
   OR HAVE_FUNC_GETHOSTBYNAME_R_3
 )
-  set(
-    HAVE_GETHOSTBYNAME_R 1
-    CACHE INTERNAL "Define to 1 if you have some form of gethostbyname_r()."
-  )
+  set(HAVE_GETHOSTBYNAME_R TRUE)
 endif()
diff --git a/cmake/cmake/modules/PHP/CheckReentrantFunctions.cmake b/cmake/cmake/modules/PHP/CheckReentrantFunctions.cmake
@@ -57,7 +57,7 @@ function(_php_check_reentrant_function symbol header)
     message(CHECK_FAIL "missing")
 
     set(
-      MISSING_${const}_DECL 1
+      MISSING_${const}_DECL TRUE
       CACHE INTERNAL "Define if ${symbol} is not declared."
     )
   else()
diff --git a/cmake/cmake/modules/PHP/StandardLibrary.cmake b/cmake/cmake/modules/PHP/StandardLibrary.cmake
@@ -16,8 +16,7 @@ Determine the C standard library used for the build.
     * `musl`
     * `uclibc`
 
-## Cache variables
-* `__MUSL__`
+* `__MUSL__` - Whether C standard library is musl.
 #]=============================================================================]
 
 include_guard(GLOBAL)
@@ -109,7 +108,7 @@ else()
   endblock()
 endif()
 if(PHP_C_STANDARD_LIBRARY STREQUAL "musl")
-  set(__MUSL__ 1 CACHE INTERNAL "Whether musl libc is used.")
+  set(__MUSL__ TRUE)
   message(CHECK_PASS "musl")
   return()
 endif()
diff --git a/cmake/cmake/platforms/Darwin.cmake b/cmake/cmake/platforms/Darwin.cmake
@@ -25,7 +25,7 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  set(DARWIN 1 CACHE INTERNAL "Define if the target system is Darwin")
+  set(DARWIN TRUE)
 
   # TODO: This is still needed for shared extensions on macOS, otherwise
   # undefined symbol errors happen in the linking step when using Clang.
diff --git a/cmake/ext/opcache/cmake/CheckSHM.cmake b/cmake/ext/opcache/cmake/CheckSHM.cmake
@@ -1,20 +1,28 @@
 #[=============================================================================[
+# CheckSHM
+
 Check for shared memory (SHM) operations functions and required libraries.
 
 If no SHM support is found, a FATAL error is thrown.
 
 ## Cache variables
 
 * `HAVE_SHM_IPC`
+
   Whether SysV IPC SHM support is available.
+
 * `HAVE_SHM_MMAP_ANON`
+
   Whether `mmap(MAP_ANON)` SHM support is found.
+
 * `HAVE_SHM_MMAP_POSIX`
+
   Whether POSIX `mmap()` SHM support is found.
 
 IMPORTED target:
 
 * `PHP::CheckSHMLibrary`
+
   If there is additional library to be linked for using SHM POSIX functions.
 #]=============================================================================]
 
diff --git a/cmake/ext/posix/cmake/CheckTtynameR.cmake b/cmake/ext/posix/cmake/CheckTtynameR.cmake
@@ -1,4 +1,6 @@
 #[=============================================================================[
+# CheckTtynameR
+
 Check `ttyname_r()`.
 
 On Solaris/illumos `ttyname_r()` works only with larger buffers (>= 128),
@@ -16,6 +18,7 @@ check_symbol_exists(ttyname_r unistd.h HAVE_TTYNAME_R)
 ## Cache variables
 
 * `HAVE_TTYNAME_R`
+
   Whether `ttyname_r()` works as expected.
 #]=============================================================================]
 
diff --git a/cmake/ext/session/cmake/CheckPreadPwrite.cmake b/cmake/ext/session/cmake/CheckPreadPwrite.cmake
@@ -1,4 +1,6 @@
 #[=============================================================================[
+# CheckPreadPwrite
+
 Check whether `pread()` and `pwrite()` work.
 
 Module first checks whether functions are available on the system, and then
@@ -14,13 +16,20 @@ check_symbol_exists(<symbol> unistd.h HAVE_<SYMBOL>)
 ## Cache variables
 
 * `HAVE_PREAD`
-    Whether `pread()` is available.
+
+  Whether `pread()` is available.
+
 * `PHP_PREAD_64`
-    Whether pread64 is default.
+
+  Whether pread64 is default.
+
 * `HAVE_PWRITE`
-    Whether `pwrite()` is available.
+
+  Whether `pwrite()` is available.
+
 * `PHP_PWRITE_64`
-    Whether pwrite64 is default.
+
+  Whether pwrite64 is default.
 #]=============================================================================]
 
 include_guard(GLOBAL)
@@ -127,7 +136,7 @@ function(_php_check_pread)
     cmake_pop_check_state()
 
     if(PHP_PREAD_64)
-      set(HAVE_PREAD 1 CACHE INTERNAL "Whether pread() works")
+      set(HAVE_PREAD TRUE CACHE INTERNAL "Whether pread() works")
     endif()
   endif()
 
@@ -234,7 +243,7 @@ function(_php_check_pwrite)
     cmake_pop_check_state()
 
     if(PHP_PWRITE_64)
-      set(HAVE_PWRITE 1 CACHE INTERNAL "Whether pwrite() works")
+      set(HAVE_PWRITE TRUE CACHE INTERNAL "Whether pwrite() works")
     endif()
   endif()
 
diff --git a/cmake/ext/skeleton/cmake/modules/FindPHP.cmake b/cmake/ext/skeleton/cmake/modules/FindPHP.cmake
diff --git a/cmake/ext/standard/cmake/CheckCrypt.cmake b/cmake/ext/standard/cmake/CheckCrypt.cmake
diff --git a/cmake/ext/standard/cmake/CheckFclose.cmake b/cmake/ext/standard/cmake/CheckFclose.cmake
diff --git a/cmake/ext/standard/cmake/CheckFnmatch.cmake b/cmake/ext/standard/cmake/CheckFnmatch.cmake
diff --git a/cmake/ext/standard/cmake/CheckStrptime.cmake b/cmake/ext/standard/cmake/CheckStrptime.cmake
diff --git a/cmake/sapi/fpm/cmake/CheckListeningQueue.cmake b/cmake/sapi/fpm/cmake/CheckListeningQueue.cmake
diff --git a/cmake/sapi/fpm/cmake/CheckTrace.cmake b/cmake/sapi/fpm/cmake/CheckTrace.cmake
diff --git a/cmake/sapi/phpdbg/cmake/CheckTiocgwinsz.cmake b/cmake/sapi/phpdbg/cmake/CheckTiocgwinsz.cmake
