Add various improvements

- gethostbyname_r() checked with CMake native way and its sanity check
  fixed for modern compiler settings
- sapi/apache2handler syncs moved further one step
- FindApache module is now fully synced with upstream way - future
  refactorings might still be needed only to make it simpler and to
  find Apache custom build via Apache_ROOT variable a bit better
- fixed CS
- dmake check added in bin/init.sh script for very special cases to
  append the number of jobs in the build step

Author: petk

bin/check-cmake/cmake-includes.sh

@@ -88,6 +88,7 @@ modules="
   FindPackageMessage
   ProcessorCount
 
+  PHP/CheckFunctionAttribute
   PHP/PkgConfigGenerator
   PHP/SearchLibraries
 "
@@ -148,6 +149,7 @@ FindPackageHandleStandardArgs="
 FindPackageMessage="find_package_message"
 ProcessorCount="processorcount"
 
+PHP_CheckFunctionAttribute="php_check_function_attribute"
 PHP_PkgConfigGenerator="pkgconfig_generate_pc"
 PHP_SearchLibraries="php_search_libraries"
 

bin/init.sh

@@ -218,8 +218,9 @@ if test -n "$generator"; then
 fi
 
 # Check if make -j requires argument (Berkeley-based make implementations).
-if make -h 2>&1 | grep -q "\[-j max_jobs\]"; then
-  # Linux has nproc, macOS and some BSD-based systems have sysctl.
+if make -h 2>&1 | grep -q "\[-j max_jobs\]" \
+  || make -h 2>&1 | grep "\-j dmake_max_jobs"; then
+  # Linux, illumos has nproc, macOS and some BSD-based systems have sysctl.
   if command -v nproc > /dev/null; then
     jobs=$(nproc)
   elif command -v sysctl > /dev/null; then

cmake/cmake/modules/FindApache.cmake

@@ -156,12 +156,26 @@ endif()
 
 find_program(
   Apache_APR_CONFIG_EXECUTABLE
-  NAMES apr-1-config apr-config
+  NAMES apr-config apr-1-config
   PATHS ${_Apache_APR_BINDIR}
   DOC "Path to the apr library command-line tool for retrieving metainformation"
 )
 mark_as_advanced(Apache_APR_CONFIG_EXECUTABLE)
 
+block()
+  if(NOT Apache_APR_CONFIG_EXECUTABLE AND Apache_APXS_EXECUTABLE)
+    execute_process(
+      COMMAND "${Apache_APXS_EXECUTABLE}" -q APR_CONFIG
+      OUTPUT_VARIABLE path
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      ERROR_QUIET
+    )
+    if(IS_EXECUTABLE ${path})
+      set_property(CACHE Apache_APR_CONFIG_EXECUTABLE PROPERTY VALUE ${path})
+    endif()
+  endif()
+endblock()
+
 if(Apache_APR_CONFIG_EXECUTABLE)
   execute_process(
     COMMAND "${Apache_APR_CONFIG_EXECUTABLE}" --cppflags
@@ -191,6 +205,7 @@ find_path(
   PATHS
     ${PC_Apache_APR_INCLUDE_DIRS}
     ${_Apache_APR_INCLUDE_DIR}
+    ${_Apache_APU_INCLUDE_DIR}
   PATH_SUFFIXES apr-1
   DOC "Directory containing apr library headers"
 )
@@ -217,12 +232,35 @@ endif()
 
 find_program(
   Apache_APU_CONFIG_EXECUTABLE
-  NAMES apu-1-config apu-config
+  NAMES apu-config apu-1-config
   PATHS ${_Apache_APU_BINDIR}
   DOC "Path to the Apache Portable Runtime Utilities config command-line tool"
 )
 mark_as_advanced(Apache_APU_CONFIG_EXECUTABLE)
 
+block()
+  if(NOT Apache_APU_CONFIG_EXECUTABLE AND Apache_APXS_EXECUTABLE)
+    execute_process(
+      COMMAND "${Apache_APXS_EXECUTABLE}" -q APU_CONFIG
+      OUTPUT_VARIABLE path
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      ERROR_QUIET
+    )
+    if(IS_EXECUTABLE ${path})
+      set_property(CACHE Apache_APU_CONFIG_EXECUTABLE PROPERTY VALUE ${path})
+    endif()
+  endif()
+endblock()
+
+if(Apache_APU_CONFIG_EXECUTABLE)
+  execute_process(
+    COMMAND "${Apache_APU_CONFIG_EXECUTABLE}" --includedir
+    OUTPUT_VARIABLE _Apache_APU_INCLUDE_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+  )
+endif()
+
 ################################################################################
 # Apache.
 ################################################################################

cmake/cmake/modules/FindPHPSystem.cmake

@@ -32,8 +32,21 @@ set(_reason "")
 
 find_program(
   PHPSystem_EXECUTABLE
-  NAMES php php7 php74 php7.4 php8 php81 php8.1 php82 php8.2 php83 php8.3 php84
-        php8.4
+  NAMES
+    php
+    php8.4
+    php84
+    php8.3
+    php83
+    php8.2
+    php82
+    php8.1
+    php81
+    php8
+    php7.4
+    php74
+    php7
+
   DOC "Path to the PHP executable"
 )
 

cmake/cmake/modules/PHP/CheckGethostbynameR.cmake

@@ -1,119 +1,103 @@
 #[=============================================================================[
-Check which gethostbyname_r() function should be used.
+Check gethostbyname_r().
 
-The gethostbyname_r() function has different signatures on different systems.
+The non-standard gethostbyname_r() function has different signatures across
+systems:
 
-See https://github.com/autoconf-archive/autoconf-archive/blob/master/m4/ax_func_which_gethostbyname_r.m4
+* Linux, BSD: 6 arguments
+* Solaris, illumos: 5 arguments
+* AIX, HP-UX: 3 arguments
+* Haiku: network library has it for internal purposes, not intended for usage
+  from the system headers.
+
+See also:
+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_3
-    Whether function has 3 arguments.
-  HAVE_FUNC_GETHOSTBYNAME_R_5
-    Whether function has 5 arguments.
   HAVE_FUNC_GETHOSTBYNAME_R_6
-    Whether function has 6 arguments.
+    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.
 ]=============================================================================]#
 
 include_guard(GLOBAL)
 
-include(CheckSourceCompiles)
+include(CheckPrototypeDefinition)
+include(CheckSymbolExists)
 include(CMakePushCheckState)
 
-message(CHECK_START "Checking how many arguments gethostbyname_r() takes")
-
-cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_QUIET TRUE)
+function(_php_check_gethostbyname_r)
+  message(CHECK_START "Checking number of gethostbyname_r() arguments")
 
-  # Sanity check with 1 argument signature.
-  check_source_compiles(C [[
-    #include <netdb.h>
-
-    int main(void) {
-      char *name = "www.gnu.org";
-      (void)gethostbyname_r(name);
-
-      return 0;
-    }
-  ]] _have_one_argument)
-
-  if(_have_one_argument)
-    cmake_pop_check_state()
-    message(CHECK_FAIL "can't tell")
-    message(WARNING "Cannot find function declaration in netdb.h")
+  # Check whether gethostname_r() is available.
+  check_symbol_exists(gethostbyname_r netdb.h _HAVE_GETHOSTBYNAME_R)
+  if(NOT _HAVE_GETHOSTBYNAME_R)
+    message(CHECK_FAIL "not found")
     return()
   endif()
 
   # Check for 6 arguments signature.
-  check_source_compiles(C [[
-    #include <netdb.h>
-
-    int main(void) {
-      char *name = "www.gnu.org";
-      struct hostent ret, *retp;
-      char buf[1024];
-      int buflen = 1024;
-      int my_h_errno;
-      (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno);
-
-      return 0;
-    }
-  ]] HAVE_FUNC_GETHOSTBYNAME_R_6)
+  check_prototype_definition(
+    gethostbyname_r
+    "int gethostbyname_r(const char *name, struct hostent *ret, char *buf, \
+      size_t buflen, struct hostent **result, int *h_errnop)"
+    "0"
+    netdb.h
+    HAVE_FUNC_GETHOSTBYNAME_R_6
+  )
+  if(HAVE_FUNC_GETHOSTBYNAME_R_6)
+    message(CHECK_PASS "six")
+    return()
+  endif()
 
   # Check for 5 arguments signature.
-  if(NOT HAVE_FUNC_GETHOSTBYNAME_R_6)
-    check_source_compiles(C [[
-      #include <netdb.h>
-
-      int main(void) {
-        char *name = "www.gnu.org";
-        struct hostent ret;
-        char buf[1024];
-        int buflen = 1024;
-        int my_h_errno;
-        (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno);
-
-        return 0;
-      }
-    ]] HAVE_FUNC_GETHOSTBYNAME_R_5)
+  check_prototype_definition(
+    gethostbyname_r
+    "struct hostent *gethostbyname_r(const char *name, struct hostent *result, \
+      char *buffer, int buflen, int *h_errnop)"
+    "0"
+    netdb.h
+    HAVE_FUNC_GETHOSTBYNAME_R_5
+  )
+  if(HAVE_FUNC_GETHOSTBYNAME_R_5)
+    message(CHECK_PASS "five")
+    return()
   endif()
 
   # Check for 3 arguments signature.
-  if(NOT HAVE_FUNC_GETHOSTBYNAME_R_6 AND NOT HAVE_FUNC_GETHOSTBYNAME_R_5)
-    check_source_compiles(C [[
-      #include <netdb.h>
+  check_prototype_definition(
+    gethostbyname_r
+    "int gethostbyname_r(const char *name, struct hostent *htent, \
+      struct hostent_data *data)"
+    "0"
+    netdb.h
+    HAVE_FUNC_GETHOSTBYNAME_R_3
+  )
+  if(HAVE_FUNC_GETHOSTBYNAME_R_3)
+    message(CHECK_PASS "three")
+    return()
+  endif()
 
-      int main(void) {
-        char *name = "www.gnu.org";
-        struct hostent ret;
-        struct hostent_data data;
-        (void)gethostbyname_r(name, &ret, &data);
+  message(CHECK_FAIL "unknown")
+endfunction()
 
-        return 0;
-      }
-    ]] HAVE_FUNC_GETHOSTBYNAME_R_3)
-  endif()
+cmake_push_check_state(RESET)
+  set(CMAKE_REQUIRED_QUIET TRUE)
+  _php_check_gethostbyname_r()
 cmake_pop_check_state()
 
 if(
-  HAVE_FUNC_GETHOSTBYNAME_R_3
+  HAVE_FUNC_GETHOSTBYNAME_R_6
   OR HAVE_FUNC_GETHOSTBYNAME_R_5
-  OR HAVE_FUNC_GETHOSTBYNAME_R_6
+  OR HAVE_FUNC_GETHOSTBYNAME_R_3
 )
   set(
     HAVE_GETHOSTBYNAME_R 1
     CACHE INTERNAL "Define to 1 if you have some form of gethostbyname_r()."
   )
 endif()
-
-if(HAVE_FUNC_GETHOSTBYNAME_R_3)
-  message(CHECK_PASS "three")
-elseif(HAVE_FUNC_GETHOSTBYNAME_R_5)
-  message(CHECK_PASS "five")
-elseif(HAVE_FUNC_GETHOSTBYNAME_R_6)
-  message(CHECK_PASS "six")
-else()
-  message(CHECK_FAIL "can't tell")
-endif()

cmake/sapi/apache2handler/CMakeLists.txt

@@ -43,6 +43,12 @@ set_target_properties(
     OUTPUT_NAME apache
 )
 
+target_compile_definitions(
+  php_apache2handler
+  PRIVATE
+    ZEND_ENABLE_STATIC_TSRMLS_CACHE=1
+)
+
 find_package(Apache 2.0.44)
 set_package_properties(
   Apache