Improve consecutive configuration phases

petk · petk · commit 7b895d788a25 · 2025-01-14T08:28:22.000+01:00
diff --git a/cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake b/cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake
@@ -19,6 +19,11 @@ include_guard(GLOBAL)
 include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
+# Skip in consecutive configuration phases.
+if(DEFINED HAVE_GCC_GLOBAL_REGS)
+  return()
+endif()
+
 message(CHECK_START "Checking for global register variables support")
 
 cmake_push_check_state(RESET)
diff --git a/cmake/Zend/cmake/CheckStackDirection.cmake b/cmake/Zend/cmake/CheckStackDirection.cmake
@@ -15,6 +15,11 @@ include_guard(GLOBAL)
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 
+# Skip in consecutive configuration phases.
+if(DEFINED ZEND_CHECK_STACK_LIMIT)
+  return()
+endif()
+
 message(CHECK_START "Checking whether the stack grows downwards")
 
 cmake_push_check_state(RESET)
diff --git a/cmake/Zend/cmake/Fibers.cmake b/cmake/Zend/cmake/Fibers.cmake
@@ -35,30 +35,32 @@ include(CMakePushCheckState)
 add_library(zend_fibers INTERFACE)
 add_library(Zend::Fibers ALIAS zend_fibers)
 
-message(CHECK_START "Whether syscall to create shadow stack exists")
-cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_QUIET TRUE)
-
-  check_source_runs(C [[
-    #include <unistd.h>
-    #include <sys/mman.h>
-    int main(void)
-    {
-      void* base = (void *)syscall(451, 0, 0x20000, 0x1);
-      if (base != (void*)-1) {
-        munmap(base, 0x20000);
-        return 0;
+if(NOT DEFINED SHADOW_STACK_SYSCALL)
+  message(CHECK_START "Whether syscall to create shadow stack exists")
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_source_runs(C [[
+      #include <unistd.h>
+      #include <sys/mman.h>
+      int main(void)
+      {
+        void* base = (void *)syscall(451, 0, 0x20000, 0x1);
+        if (base != (void*)-1) {
+          munmap(base, 0x20000);
+          return 0;
+        }
+        return 1;
       }
-      return 1;
-    }
-  ]] SHADOW_STACK_SYSCALL)
-cmake_pop_check_state()
-if(SHADOW_STACK_SYSCALL)
-  message(CHECK_PASS "yes")
-else()
-  # If the syscall doesn't exist, we may block the final ELF from
-  # __PROPERTY_SHSTK via redefine macro as "-D__CET__=1".
-  message(CHECK_FAIL "no")
+    ]] SHADOW_STACK_SYSCALL)
+  cmake_pop_check_state()
+  if(SHADOW_STACK_SYSCALL)
+    message(CHECK_PASS "yes")
+  else()
+    # If the syscall doesn't exist, we may block the final ELF from
+    # __PROPERTY_SHSTK via redefine macro as "-D__CET__=1".
+    message(CHECK_FAIL "no")
+  endif()
 endif()
 
 block()
diff --git a/cmake/Zend/cmake/MaxExecutionTimers.cmake b/cmake/Zend/cmake/MaxExecutionTimers.cmake
@@ -16,7 +16,7 @@ Check whether to enable Zend max execution timers.
 * `ZEND_MAX_EXECUTION_TIMERS`
 
   A local variable based on the cache variable and thread safety to be able to
-  run consecutive configuration runs. When `ZEND_MAX_EXECUTION_TIMERS` cache
+  run consecutive configuration phases. When `ZEND_MAX_EXECUTION_TIMERS` cache
   variable is set to 'auto', local variable default value is set to the
   `PHP_THREAD_SAFETY` value.
 
diff --git a/cmake/cmake/ConfigureChecks.cmake b/cmake/cmake/ConfigureChecks.cmake
@@ -455,22 +455,24 @@ else()
   check_symbol_exists(alloca "stdlib.h" HAVE_ALLOCA)
 endif()
 
-message(CHECK_START "Checking whether the compiler supports __alignof__")
-cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_QUIET TRUE)
-  check_source_compiles(C [[
-    int main(void)
-    {
-      int align = __alignof__(int);
-      (void)align;
-      return 0;
-    }
-  ]] HAVE_ALIGNOF)
-cmake_pop_check_state()
-if(HAVE_ALIGNOF)
-  message(CHECK_PASS "yes")
-else()
-  message(CHECK_FAIL "no")
+if(NOT DEFINED HAVE_ALIGNOF)
+  message(CHECK_START "Checking whether the compiler supports __alignof__")
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_QUIET TRUE)
+    check_source_compiles(C [[
+      int main(void)
+      {
+        int align = __alignof__(int);
+        (void)align;
+        return 0;
+      }
+    ]] HAVE_ALIGNOF)
+  cmake_pop_check_state()
+  if(HAVE_ALIGNOF)
+    message(CHECK_PASS "yes")
+  else()
+    message(CHECK_FAIL "no")
+  endif()
 endif()
 
 # Check for GCC function attributes on all systems except ones without glibc.
diff --git a/cmake/cmake/modules/PHP/Bison.cmake b/cmake/cmake/modules/PHP/Bison.cmake
@@ -288,14 +288,14 @@ function(php_bison name input output)
 
   _php_bison_config()
 
+  # Skip consecutive find_package() calls when:
+  # - project calls php_bison() multiple times and Bison will be downloaded
+  # - the outer find_package() was called prior to php_bison()
+  # - running consecutive configuration phases and Bison will be downloaded
   if(
-    # Skip consecutive find_package() calls when:
-    # - project calls php_bison() multiple times and Bison will be downloaded:
     NOT TARGET Bison::Bison
-    # - the outer find_package() was called prior to php_bison():
     AND NOT DEFINED BISON_FOUND
-    # - running consecutive configuration phases:
-    AND NOT BISON_EXECUTABLE
+    AND NOT _PHP_BISON_DOWNLOAD
   )
     find_package(BISON ${PHP_BISON_VERSION} ${quiet})
   endif()
@@ -650,5 +650,10 @@ function(_php_bison_download)
   get_property(packagesFound GLOBAL PROPERTY PACKAGES_FOUND)
   set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND BISON)
 
+  set(
+    _PHP_BISON_DOWNLOAD TRUE
+    CACHE INTERNAL "Internal marker whether the Bison will be downloaded"
+  )
+
   return(PROPAGATE BISON_FOUND BISON_VERSION)
 endfunction()
diff --git a/cmake/cmake/modules/PHP/CheckAVX512.cmake b/cmake/cmake/modules/PHP/CheckAVX512.cmake
@@ -23,6 +23,11 @@ include_guard(GLOBAL)
 include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
+# Skip in consecutive configuration phases.
+if(DEFINED PHP_HAVE_AVX512_SUPPORTS AND DEFINED PHP_HAVE_AVX512_VBMI_SUPPORTS)
+  return()
+endif()
+
 message(CHECK_START "Checking for AVX-512 extensions support")
 
 cmake_push_check_state(RESET)
diff --git a/cmake/cmake/modules/PHP/CheckAttribute.cmake b/cmake/cmake/modules/PHP/CheckAttribute.cmake
@@ -103,6 +103,11 @@ function(_php_check_attribute what attribute result)
     message(FATAL_ERROR "Wrong argument passed: ${what}")
   endif()
 
+  # Skip in consecutive configuration phases.
+  if(DEFINED ${result})
+    return()
+  endif()
+
   message(CHECK_START "Checking for ${what} attribute ${attribute}")
 
   cmake_push_check_state(RESET)
diff --git a/cmake/cmake/modules/PHP/CheckBrokenGccStrlenOpt.cmake b/cmake/cmake/modules/PHP/CheckBrokenGccStrlenOpt.cmake
@@ -18,6 +18,11 @@ include_guard(GLOBAL)
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 
+# Skip in consecutive configuration phases.
+if(DEFINED PHP_HAVE_BROKEN_OPTIMIZE_STRLEN)
+  return()
+endif()
+
 if(
   NOT CMAKE_C_COMPILER_ID STREQUAL "GNU"
   OR (
diff --git a/cmake/cmake/modules/PHP/CheckBuiltin.cmake b/cmake/cmake/modules/PHP/CheckBuiltin.cmake
@@ -27,6 +27,11 @@ include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
 function(php_check_builtin builtin result)
+  # Skip in consecutive configuration phases.
+  if(DEFINED ${result})
+    return()
+  endif()
+
   message(CHECK_START "Checking for ${builtin}")
 
   if(builtin STREQUAL "__builtin_clz")
diff --git a/cmake/cmake/modules/PHP/CheckByteOrder.cmake b/cmake/cmake/modules/PHP/CheckByteOrder.cmake
@@ -12,12 +12,18 @@ include_guard(GLOBAL)
 
 include(CheckSourceRuns)
 
+# Skip in consecutive configuration phases.
+if(DEFINED WORDS_BIGENDIAN)
+  return()
+endif()
+
 message(CHECK_START "Checking byte ordering")
 
 if(CMAKE_C_BYTE_ORDER STREQUAL "BIG_ENDIAN")
   message(CHECK_PASS "big-endian")
   set(WORDS_BIGENDIAN TRUE CACHE INTERNAL "Whether byte ordering is big-endian.")
 elseif(CMAKE_C_BYTE_ORDER STREQUAL "LITTLE_ENDIAN")
+  set(WORDS_BIGENDIAN FALSE CACHE INTERNAL "Whether byte ordering is big-endian.")
   message(CHECK_PASS "little-endian")
 else()
   if(
diff --git a/cmake/cmake/modules/PHP/CheckCompilerFlag.cmake b/cmake/cmake/modules/PHP/CheckCompilerFlag.cmake
@@ -65,6 +65,11 @@ function(php_check_compiler_flag lang flag result)
     message(FATAL_ERROR "Missing arguments.")
   endif()
 
+  # Skip in consecutive configuration phases.
+  if(DEFINED ${result})
+    return()
+  endif()
+
   if(NOT CMAKE_REQUIRED_QUIET)
     message(CHECK_START "Checking whether the ${lang} compiler accepts ${flag}")
   endif()
diff --git a/cmake/cmake/modules/PHP/CheckCopyFileRange.cmake b/cmake/cmake/modules/PHP/CheckCopyFileRange.cmake
@@ -17,6 +17,11 @@ include_guard(GLOBAL)
 include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
+# Skip in consecutive configuration phases.
+if(DEFINED HAVE_COPY_FILE_RANGE)
+  return()
+endif()
+
 message(CHECK_START "Checking for copy_file_range")
 
 cmake_push_check_state(RESET)
diff --git a/cmake/cmake/modules/PHP/CheckFlushIo.cmake b/cmake/cmake/modules/PHP/CheckFlushIo.cmake
@@ -16,6 +16,11 @@ include(CheckIncludeFile)
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 
+# Skip in consecutive configuration phases.
+if(DEFINED HAVE_FLUSHIO)
+  return()
+endif()
+
 message(CHECK_START
   "Checking whether flush should be called explicitly after a buffered io"
 )
diff --git a/cmake/cmake/modules/PHP/CheckFopencookie.cmake b/cmake/cmake/modules/PHP/CheckFopencookie.cmake
@@ -47,6 +47,11 @@ if(NOT HAVE_FOPENCOOKIE)
   return()
 endif()
 
+# Skip in consecutive configuration phases.
+if(DEFINED COOKIE_SEEKER_USES_OFF64_T)
+  return()
+endif()
+
 # GNU C library can have a different seeker definition using off64_t.
 message(CHECK_START "Checking whether fopencookie seeker uses off64_t")
 
diff --git a/cmake/cmake/modules/PHP/CheckIPv6.cmake b/cmake/cmake/modules/PHP/CheckIPv6.cmake
@@ -15,6 +15,11 @@ include_guard(GLOBAL)
 include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
+# Skip in consecutive configuration phases.
+if(DEFINED HAVE_IPV6)
+  return()
+endif()
+
 message(CHECK_START "Checking for IPv6 support")
 
 cmake_push_check_state(RESET)
diff --git a/cmake/cmake/modules/PHP/CheckReentrantFunctions.cmake b/cmake/cmake/modules/PHP/CheckReentrantFunctions.cmake
@@ -30,8 +30,6 @@ functions on current systems and this module might be obsolete in the future.
 
   Whether `strtok_r()` is available.
 
-## Result variables
-
 * `MISSING_ASCTIME_R_DECL`
 
   Whether `asctime_r()` is not declared.
@@ -64,6 +62,10 @@ include(CMakePushCheckState)
 function(_php_check_reentrant_function symbol header)
   string(TOUPPER "${symbol}" const)
 
+  if(DEFINED PHP_HAVE_DECL_${const})
+    return()
+  endif()
+
   # Check if linker sees the function.
   check_function_exists(${symbol} HAVE_${const})
 
@@ -76,11 +78,16 @@ function(_php_check_reentrant_function symbol header)
 
   if(NOT PHP_HAVE_DECL_${const})
     message(CHECK_FAIL "missing")
-
-    set(MISSING_${const}_DECL TRUE)
+    set(isMissing TRUE)
   else()
     message(CHECK_PASS "found")
+    set(isMissing FALSE)
   endif()
+
+  set(
+    MISSING_${const}_DECL ${isMissing}
+    CACHE INTERNAL "Whether the ${symbol}() is not declared."
+  )
 endfunction()
 
 _php_check_reentrant_function(asctime_r time.h)
diff --git a/cmake/cmake/modules/PHP/Re2c.cmake b/cmake/cmake/modules/PHP/Re2c.cmake
@@ -296,14 +296,14 @@ function(php_re2c name input output)
 
   _php_re2c_config()
 
+  # Skip consecutive find_package() calls when:
+  # - project calls php_re2c() multiple times and re2c will be downloaded
+  # - the outer find_package() was called prior to php_re2c()
+  # - running consecutive configuration phases and re2c will be downloaded
   if(
-    # Skip consecutive find_package() calls when:
-    # - project calls php_re2c() multiple times and re2c will be downloaded:
     NOT TARGET RE2C::RE2C
-    # - the outer find_package() was called prior to php_re2c():
     AND NOT DEFINED RE2C_FOUND
-    # - running consecutive configuration phases:
-    AND NOT RE2C_EXECUTABLE
+    AND NOT _PHP_RE2C_DOWNLOAD
   )
     find_package(RE2C ${PHP_RE2C_VERSION} ${quiet})
   endif()
@@ -653,5 +653,10 @@ function(_php_re2c_download)
   get_property(packagesFound GLOBAL PROPERTY PACKAGES_FOUND)
   set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND RE2C)
 
+  set(
+    _PHP_RE2C_DOWNLOAD TRUE
+    CACHE INTERNAL "Internal marker whether the re2c will be downloaded"
+  )
+
   return(PROPAGATE RE2C_FOUND RE2C_VERSION)
 endfunction()
