Fix nits

- Remove CMAKE_VERBOSE_MAKEFILE option (this is already defined by CMake
  and available also in the GUI).
- Moved return() to proper place in Zend/cmake/CheckStrerrorR.cmake.
- Updated re2c download version to 4.2.
- Refactored the fnmatch() check.

Author: petk

cmake/Zend/cmake/CheckStrerrorR.cmake

@@ -34,8 +34,8 @@ set(HAVE_STRERROR_R TRUE)
 if(DEFINED PHP_ZEND_HAS_STRERROR_R_CHAR_P)
   if(PHP_ZEND_HAS_STRERROR_R_CHAR_P)
     set(STRERROR_R_CHAR_P TRUE)
-    return()
   endif()
+  return()
 endif()
 
 message(CHECK_START "Checking strerror_r() return type")

cmake/cmake/CMakeDefaults.cmake

@@ -29,10 +29,6 @@ set(CMAKE_SHARED_LIBRARY_PREFIX_CXX "")
 set(CMAKE_SHARED_MODULE_PREFIX_CXX "")
 set(CMAKE_STATIC_LIBRARY_PREFIX_CXX "")
 
-# Whether to enable verbose output from Makefile builds.
-option(CMAKE_VERBOSE_MAKEFILE "Enable verbose output from Makefile builds")
-mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
-
 # Whether to show message context in configuration log.
 option(
   CMAKE_MESSAGE_CONTEXT_SHOW

cmake/cmake/ConfigureChecks.cmake

@@ -406,6 +406,7 @@ endif()
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckAVX512.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckCopyFileRange.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckFlushIo.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckFnmatch.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckFopencookie.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckGetaddrinfo.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckGethostbynameR.cmake)

cmake/ext/standard/cmake/CheckFnmatch.cmake renamed to cmake/cmake/checks/CheckFnmatch.cmake

@@ -1,53 +1,55 @@
 #[=============================================================================[
-# CheckFnmatch
+Check for a working POSIX 'fnmatch()' function.
 
-Check for a working POSIX `fnmatch()` function.
+This check is based on the 'AC_FUNC_FNMATCH' Autoconf macro. Some versions of
+Solaris (2.4), SCO, and the GNU C Library have a broken or incompatible fnmatch.
+In cross-compilation it is checked with the CheckSymbolExists module instead
+and assumed to have a POSIX-compatible implementation.
 
-Some versions of Solaris (2.4), SCO, and the GNU C Library have a broken or
-incompatible fnmatch. When cross-compiling we only enable it for Linux systems.
-Based on the `AC_FUNC_FNMATCH` Autoconf macro.
-
-TODO: This is obsolescent. See Gnulib's fnmatch-gnu module:
+Gnulib provides also fnmatch-gnu module:
 https://www.gnu.org/software/gnulib/MODULES.html#module=fnmatch
 
-## Cache variables
-
-* `HAVE_FNMATCH`
+Result variables:
 
-  Whether `fnmatch` is a working POSIX variant.
+* HAVE_FNMATCH
+#]=============================================================================]
 
-## Usage
+# PHP has fnmatch() emulation implemented on Windows.
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(HAVE_FNMATCH TRUE)
+  return()
+endif()
 
-```cmake
-# CMakeLists.txt
-include(cmake/CheckFnmatch.cmake)
-```
-#]=============================================================================]
+set(HAVE_FNMATCH FALSE)
 
-include_guard(GLOBAL)
+# Skip in consecutive configuration phases or if overridden.
+if(DEFINED PHP_HAS_FNMATCH)
+  if(PHP_HAS_FNMATCH)
+    set(HAVE_FNMATCH TRUE)
+  endif()
 
-# Skip in consecutive configuration phases.
-if(DEFINED HAVE_FNMATCH)
   return()
 endif()
 
+include_guard(GLOBAL)
+
 include(CheckSourceRuns)
+include(CheckSymbolExists)
 include(CMakePushCheckState)
 
 message(CHECK_START "Checking for a working POSIX fnmatch() function")
 
-if(
-  NOT DEFINED HAVE_FNMATCH_EXITCODE
-  AND CMAKE_CROSSCOMPILING
-  AND NOT CMAKE_CROSSCOMPILING_EMULATOR
-  AND CMAKE_SYSTEM_NAME STREQUAL "Linux"
-)
-  set(HAVE_FNMATCH_EXITCODE 0)
-endif()
-
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
 
+  if(
+    CMAKE_CROSSCOMPILING
+    AND NOT CMAKE_CROSSCOMPILING_EMULATOR
+    AND NOT DEFINED PHP_HAS_FNMATCH_EXITCODE
+  )
+    check_symbol_exists(fnmatch fnmatch.h PHP_HAS_FNMATCH)
+  endif()
+
   check_source_runs(C [[
     #include <fnmatch.h>
     #define y(a, b, c) (fnmatch (a, b, c) == 0)
@@ -64,10 +66,11 @@ cmake_push_check_state(RESET)
           && n ("*x", ".x", FNM_PERIOD)
           && 1));
     }
-  ]] HAVE_FNMATCH)
+  ]] PHP_HAS_FNMATCH)
 cmake_pop_check_state()
 
-if(HAVE_FNMATCH)
+if(PHP_HAS_FNMATCH)
+  set(HAVE_FNMATCH TRUE)
   message(CHECK_PASS "yes")
 else()
   message(CHECK_FAIL "no")

cmake/cmake/modules/PHP/Re2c.cmake

@@ -197,7 +197,7 @@ macro(_php_re2c_config)
 
   # If re2c is not found on the system, set which version to download.
   if(NOT PHP_RE2C_VERSION_DOWNLOAD)
-    set(PHP_RE2C_VERSION_DOWNLOAD 4.2)
+    set(PHP_RE2C_VERSION_DOWNLOAD 4.3)
   endif()
 endmacro()
 

cmake/cmake/platforms/Windows.cmake

@@ -14,9 +14,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   # Whether system has <dirent.h> header.
   set(HAVE_DIRENT_H FALSE)
 
-  # PHP has fnmatch() emulation implemented on Windows.
-  set(HAVE_FNMATCH TRUE)
-
   # Whether system has flock().
   set(HAVE_FLOCK FALSE)
 

cmake/cmake/toolchains/template.cmake

@@ -22,6 +22,9 @@ set(PHP_HAS_COOKIE_SEEKER_OFF64_T_EXITCODE 0)
 # Set the exit code if flush should be called explicitly after a buffered io.
 set(PHP_HAS_FLUSHIO_EXITCODE 1)
 
+# Set the exit code whether the fnmatch() is available and POSIX-compatible.
+set(PHP_HAS_FNMATCH_EXITCODE 0)
+
 # Set the exit code for the getaddrinfo() check.
 set(PHP_HAS_GETADDRINFO_EXITCODE 0)
 
@@ -139,9 +142,6 @@ set(PHP_PWRITE_64_EXITCODE 0)
 # ext/standard
 ################################################################################
 
-# Set the exit code for the POSIX fnmatch() check.
-set(HAVE_FNMATCH_EXITCODE 0)
-
 # Set the exit codes for the algos checks when using external crypt library
 # (PHP_EXT_STANDARD_CRYPT_EXTERNAL).
 set(PHP_HAS_CRYPT_BLOWFISH_EXITCODE 0)

cmake/ext/standard/CMakeLists.txt

@@ -285,7 +285,6 @@ endif()
 ################################################################################
 
 include(cmake/CheckArmCrc32.cmake)
-include(cmake/CheckFnmatch.cmake)
 include(cmake/CheckStrptime.cmake)
 
 # Check if there is a support means of creating a new process and defining which

cmake/ext/standard/cmake/config.h.in

@@ -34,9 +34,6 @@
 /* Define to 1 if you have the 'dns_search' function. */
 #cmakedefine HAVE_DNS_SEARCH 1
 
-/* Define to 1 if your system has a working POSIX 'fnmatch' function. */
-#cmakedefine HAVE_FNMATCH 1
-
 /* Define to 1 if you have the 'fork' function. */
 #cmakedefine HAVE_FORK 1
 

cmake/main/cmake/php_config.h.in

@@ -131,6 +131,9 @@
 /* Define to 1 if flush should be called explicitly after a buffered io. */
 #cmakedefine HAVE_FLUSHIO 1
 
+/* Define to 1 if the system has a working POSIX 'fnmatch' function. */
+#cmakedefine HAVE_FNMATCH 1
+
 /* Define to 1 if you have the 'fopencookie' function. */
 #cmakedefine HAVE_FOPENCOOKIE 1