php: add FPM support

[Thomas: adjust commit title, as suggested by Gustavo.]

Signed-off-by: Jordi Llonch <jordi.llonch@rochsystems.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/php/Config.in b/package/php/Config.in
index 46444a56007921b507dd7374cf6a1c43a864b387..4ee14c320a3b82f69eb7826809a981e044faa2b8 100644 (file)
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -17,6 +17,9 @@ config BR2_PACKAGE_PHP_CLI
 config BR2_PACKAGE_PHP_CGI
        bool
 
+config BR2_PACKAGE_PHP_FPM
+        bool
+
 choice
        prompt "Interface"
        default BR2_PACKAGE_PHP_SAPI_CGI
@@ -37,6 +40,13 @@ config BR2_PACKAGE_PHP_SAPI_CLI
        help
          Command Line Interface
 
+config BR2_PACKAGE_PHP_SAPI_FPM
+       bool "FPM"
+       depends on BR2_USE_MMU
+       select BR2_PACKAGE_PHP_FPM
+       help
+         PHP-FPM (FastCGI Process Manager)
+
 config BR2_PACKAGE_PHP_SAPI_CLI_CGI
        bool "CGI and CLI"
        # CGI uses fork()
@@ -46,6 +56,14 @@ config BR2_PACKAGE_PHP_SAPI_CLI_CGI
        help
          Command line and Common gateway interfaces
 
+config BR2_PACKAGE_PHP_SAPI_CLI_FPM
+       bool "FPM and CLI"
+       depends on BR2_USE_MMU
+       select BR2_PACKAGE_PHP_CLI
+       select BR2_PACKAGE_PHP_FPM
+       help
+         Command line and PHP-FPM (FastCGI Process Manager)
+
 endchoice
 
 endif

diff --git a/package/php/php.mk b/package/php/php.mk
index 4d3aa7d18d35da7d226acb7721a03b8a1875e9ae..fea03ebb3aec904a5170fdf6c89700ef90619615 100644 (file)
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -47,6 +47,7 @@ endif
 
 PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
 PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)
 
 ### Extensions
 PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \