Merge branch 'PHP-8.4'

Author: petk

README.md

@@ -15,10 +15,10 @@ intricacies of how to build PHP with CMake.
 
 ```sh
 # Prerequisites for Debian-based distributions:
-sudo apt install cmake gcc g++ bison libsqlite3-dev
+sudo apt install cmake gcc g++ libsqlite3-dev
 
 # Prerequisites for Fedora-based distributions:
-sudo dnf install cmake gcc gcc-c++ bison sqlite-devel
+sudo dnf install cmake gcc gcc-c++ sqlite-devel
 ```
 
 <details>
@@ -27,19 +27,19 @@ sudo dnf install cmake gcc gcc-c++ bison sqlite-devel
   ```sh
   # Prerequisites for macOS:
   xcode-select --install   # XCode command line tools
-  brew install cmake bison # See https://brew.sh how to install Homebrew
+  brew install cmake # See https://brew.sh how to install Homebrew
 
   # Prerequisites for Alpine Linux:
-  sudo apk add --no-cache cmake make gcc g++ musl-dev bison sqlite-dev
+  sudo apk add --no-cache cmake make gcc g++ musl-dev sqlite-dev
 
   # Prerequisites for BSD-based systems:
-  sudo pkg install cmake bison sqlite3
+  sudo pkg install cmake sqlite3
 
   # Prerequisites for Haiku:
-  pkgman install cmake bison sqlite_devel
+  pkgman install cmake sqlite_devel
 
   # Prerequisites for Solaris/illumos-based systems:
-  sudo pkg install cmake bison sqlite-3
+  sudo pkg install cmake sqlite-3
   ```
 </details>
 

cmake/cmake/modules/PHP/Bison.cmake

@@ -645,16 +645,8 @@ function(_php_bison_download)
 
   if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
     _php_bison_download_windows()
-  elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "^(Haiku|Linux)$")
-    _php_bison_download_gnu()
   else()
-    # TODO: Add support for more platforms.
-    message(
-      WARNING
-      "Bison couldn't be downloaded. The current platform ${CMAKE_SYSTEM_NAME} "
-      "is not yet supported by PHP/Bison module. Please install Bison manually."
-    )
-    return()
+    _php_bison_download_gnu()
   endif()
 
   add_executable(Bison::Bison IMPORTED GLOBAL)
@@ -693,24 +685,30 @@ endfunction()
 
 # Downloads GNU Bison.
 function(_php_bison_download_gnu)
-  message(
-    STATUS
-    "Downloading GNU Bison ${BISON_VERSION} from https://ftp.gnu.org/gnu/bison"
-  )
+  set(url https://mirrors.dotsrc.org/gnu/bison/bison-${BISON_VERSION}.tar.gz)
+
+  message(STATUS "Downloading ${url}")
 
   FetchContent_Declare(
     BISON
-    URL https://ftp.gnu.org/gnu/bison/bison-${BISON_VERSION}.tar.gz
+    URL ${url}
     SOURCE_SUBDIR non-existing
     DOWNLOAD_EXTRACT_TIMESTAMP TRUE
     OVERRIDE_FIND_PACKAGE
   )
 
   FetchContent_MakeAvailable(BISON)
 
+  # GNU Bison depends on m4 program.
+  find_program(PHP_BISON_M4_EXECUTABLE m4)
+  mark_as_advanced(PHP_BISON_M4_EXECUTABLE)
+  if(NOT PHP_BISON_M4_EXECUTABLE)
+    _php_bison_download_m4()
+  endif()
+
   ExternalProject_Add(
     BISON
-    STEP_TARGETS build install
+    STEP_TARGETS configure build install
     SOURCE_DIR ${bison_SOURCE_DIR}
     BINARY_DIR ${bison_BINARY_DIR}
     INSTALL_DIR ${FETCHCONTENT_BASE_DIR}/bison-install
@@ -720,26 +718,28 @@ function(_php_bison_download_gnu)
       --disable-yacc
       --enable-silent-rules
       --prefix=<INSTALL_DIR>
+      M4=${PHP_BISON_M4_EXECUTABLE}
     LOG_INSTALL TRUE
   )
 
   ExternalProject_Get_Property(BISON INSTALL_DIR)
 
   set_property(CACHE BISON_EXECUTABLE PROPERTY VALUE ${INSTALL_DIR}/bin/bison)
+
+  if(TARGET M4-install)
+    add_dependencies(BISON-configure M4-install)
+  endif()
 endfunction()
 
 # Downloads winflexbison.
 function(_php_bison_download_windows)
-  message(
-    STATUS
-    "Downloading win_bison ${BISON_VERSION} from "
-    "https://github.com/lexxmark/winflexbison "
-    "(${PHP_BISON_WIN_VERSION_DOWNLOAD})"
-  )
+  set(url https://github.com/lexxmark/winflexbison/releases/download/v${PHP_BISON_WIN_VERSION_DOWNLOAD}/win_flex_bison-${PHP_BISON_WIN_VERSION_DOWNLOAD}.zip)
+
+  message(STATUS "Downloading ${url}")
 
   FetchContent_Declare(
     BISON
-    URL https://github.com/lexxmark/winflexbison/releases/download/v${PHP_BISON_WIN_VERSION_DOWNLOAD}/win_flex_bison-${PHP_BISON_WIN_VERSION_DOWNLOAD}.zip
+    URL ${url}
     SOURCE_SUBDIR non-existing
     OVERRIDE_FIND_PACKAGE
   )
@@ -752,3 +752,36 @@ function(_php_bison_download_windows)
     PROPERTY VALUE "${bison_SOURCE_DIR}/win_bison.exe"
   )
 endfunction()
+
+function(_php_bison_download_m4)
+  set(url https://mirrors.dotsrc.org/gnu/m4/m4-1.4.20.tar.gz)
+
+  message(STATUS "Downloading ${url}")
+
+  FetchContent_Declare(
+    M4
+    URL ${url}
+    SOURCE_SUBDIR non-existing
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+  )
+
+  FetchContent_MakeAvailable(M4)
+
+  ExternalProject_Add(
+    M4
+    STEP_TARGETS build install
+    SOURCE_DIR ${m4_SOURCE_DIR}
+    BINARY_DIR ${m4_BINARY_DIR}
+    INSTALL_DIR ${FETCHCONTENT_BASE_DIR}/m4-install
+    CONFIGURE_COMMAND
+      <SOURCE_DIR>/configure
+      --disable-dependency-tracking
+      --enable-silent-rules
+      --prefix=<INSTALL_DIR>
+    LOG_INSTALL TRUE
+  )
+
+  ExternalProject_Get_Property(M4 INSTALL_DIR)
+
+  set_property(CACHE PHP_BISON_M4_EXECUTABLE PROPERTY VALUE ${INSTALL_DIR}/bin/m4)
+endfunction()

docs/cmake/cmake.md

@@ -111,11 +111,12 @@ Required:
 * g++
 * libsqlite3
 
-Optional (if not found on the system, build system tries to download it):
+Optional (if not found on the system, build system tries to download them):
 
 * libxml2
 
-Optional when building from Git repository source code:
+Optional when building from Git repository source code (if not found on the
+system, build system tries to download them):
 
 * Bison
 * re2c