diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2016-09-12 23:31:07 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-10-24 14:46:43 +0200 |
| commit | c457213fbca5f3493544c8a4335b623620458b0c (patch) | |
| tree | a944f656c24c78737d8637b2d48ccc2c0fe1b773 /package/php/Config.in | |
| parent | 8740f321fcd2b245e3585b319e2a87aa361656cd (diff) | |
| download | buildroot-c457213fbca5f3493544c8a4335b623620458b0c.tar.gz buildroot-c457213fbca5f3493544c8a4335b623620458b0c.zip | |
php: rework selection of interfaces
Following suggestion of Yann Morin, rework selection of php
interfaces: use booleans instead of choice to be able to select
multiple interfaces as they are not exclusive. We make sure at least
one of the options is selected.
It should be noted that previously CGI and FPM could not be selected
at the same time. This is now possible. Bug that prevented compilation
of CGI and FPM binaries at the same time has been fixed since PHP 5.4
(https://github.com/php-build/php-build/issues/101).
Legacy handling is added for the two options that are removed, and the
appropriate new options are selected.
Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/php/Config.in')
| -rw-r--r-- | package/php/Config.in | 46 |
1 files changed, 6 insertions, 40 deletions
diff --git a/package/php/Config.in b/package/php/Config.in index eee8d264d6..2e9e344339 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_PHP bool "php" + select BR2_PACKAGE_PHP_SAPI_CGI if \ + !BR2_PACKAGE_PHP_SAPI_CLI && \ + !BR2_PACKAGE_PHP_SAPI_FPM help PHP is a widely-used general-purpose scripting language that is especially suited for Web development @@ -9,61 +12,24 @@ config BR2_PACKAGE_PHP if BR2_PACKAGE_PHP -config BR2_PACKAGE_PHP_CLI - bool - -config BR2_PACKAGE_PHP_CGI - bool - -config BR2_PACKAGE_PHP_FPM - bool - -choice - prompt "Interface" - default BR2_PACKAGE_PHP_SAPI_CGI - help - Select the PHP interface(s). - config BR2_PACKAGE_PHP_SAPI_CGI - bool "CGI" + bool "CGI interface" # CGI uses fork() depends on BR2_USE_MMU - select BR2_PACKAGE_PHP_CGI help Common Gateway Interface config BR2_PACKAGE_PHP_SAPI_CLI - bool "CLI" - select BR2_PACKAGE_PHP_CLI + bool "CLI interface" help Command Line Interface config BR2_PACKAGE_PHP_SAPI_FPM - bool "FPM" + bool "FPM interface" 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() - depends on BR2_USE_MMU - select BR2_PACKAGE_PHP_CLI - select BR2_PACKAGE_PHP_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 - source "package/php/Config.ext" endif |
