| Message ID | 1558225183-10288-1-git-send-email-danwalkes@trellis-logic.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/php: support --with-config-file-scan-dir | expand |
Hello Dan, Thanks for your contribution! On Sat, 18 May 2019 18:19:42 -0600 Dan Walkes <danwalkes@trellis-logic.com> wrote: > To support using multiple php configuration files, allow > setting of a config file scan director via menuconfig. > > For php option details see link at [1]. > > [1] https://www.php.net/manual/en/configuration.file.php > > Signed-off-by: Dan Walkes <danwalkes@trellis-logic.com> > --- > package/php/Config.in | 5 +++++ > package/php/php.mk | 4 ++++ > 2 files changed, 9 insertions(+) Sorry for the very slow feedback. It turned out that we don't really see the need to make this configurable, so we simply added an unconditional --with-config-file-scan-dir=/etc/php.d in PHP_CONF_OPTS. See: https://git.buildroot.org/buildroot/commit/?id=1248b86267ceb545a2dd249c0067ad8cdf49636a Thomas
diff --git a/package/php/Config.in b/package/php/Config.in index 2469573..6157d4a 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -45,6 +45,11 @@ config BR2_PACKAGE_PHP_SAPI_FPM help PHP-FPM (FastCGI Process Manager) +config BR2_PACKAGE_PHP_WITH_CONFIG_FILE_SCAN_DIR + string "Specify --with-config-file-scan-dir" + help + An additional directory containing php.ini files (e.g. /etc/php.d) + source "package/php/Config.ext" endif diff --git a/package/php/php.mk b/package/php/php.mk index ed71c96..24499e8 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -318,6 +318,10 @@ PHP_CONF_OPTS += \ PHP_DEPENDENCIES += jpeg libpng freetype endif +ifneq ($(call qstrip,$(BR2_PACKAGE_PHP_WITH_CONFIG_FILE_SCAN_DIR)),) +PHP_CONF_OPTS += --with-config-file-scan-dir=$(BR2_PACKAGE_PHP_WITH_CONFIG_FILE_SCAN_DIR) +endif + ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y) define PHP_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(@D)/sapi/fpm/init.d.php-fpm \
To support using multiple php configuration files, allow setting of a config file scan director via menuconfig. For php option details see link at [1]. [1] https://www.php.net/manual/en/configuration.file.php Signed-off-by: Dan Walkes <danwalkes@trellis-logic.com> --- package/php/Config.in | 5 +++++ package/php/php.mk | 4 ++++ 2 files changed, 9 insertions(+)