[Buildroot] [PATCH v4,4/4] php: add apache support
Arnout Vandecappelle
arnout at mind.be
Sun Sep 11 23:30:38 UTC 2016
On 12-09-16 00:26, Fabrice Fontaine wrote:
> Continue work started by Bernd Kuhls in
> https://patchwork.ozlabs.org/patch/437544/
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
> Signed-off-by: Fabrice Fontaine <fabrice.fontaine at orange.com>
> ---
> Changes v3 -> v4 (after review of Yann Morin):
> - Do not select apache but depends on it
> - Move pthread detection fix in a separate patch
> - Remove unneeded configuration options such as --with-config-file-path
> - Do not allow php to update apache configuration file by removing -a
> argument from apxs call
>
> Changes v2 -> v3 (after review of Thomas Petazzoni):
> - Remove unneeded php-04-apache.patch
> - Fix pthread detection if Apache MPM is event or worker
> - Update pthread detection mechanism (--enable-pthreads does not exist
> anymore)
> - Remove unneeded --oldincludedir
> - Fix php module path
>
> package/php/Config.in | 7 +++++++
> package/php/php.mk | 22 ++++++++++++++++++++++
> 2 files changed, 29 insertions(+)
>
> diff --git a/package/php/Config.in b/package/php/Config.in
> index c90ad4f..e195fd4 100644
> --- a/package/php/Config.in
> +++ b/package/php/Config.in
> @@ -14,6 +14,13 @@ if BR2_PACKAGE_PHP
> config BR2_PACKAGE_PHP_HAS_SAPI
> bool
>
> +config BR2_PACKAGE_PHP_SAPI_APACHE
> + bool "Apache"
> + depends on BR2_PACKAGE_APACHE
> + select BR2_PACKAGE_PHP_HAS_SAPI
> + help
> + Apache module
> +
> config BR2_PACKAGE_PHP_SAPI_CGI
> bool "CGI"
> # CGI uses fork()
> diff --git a/package/php/php.mk b/package/php/php.mk
> index c4ff249..7abd012 100644
> --- a/package/php/php.mk
> +++ b/package/php/php.mk
> @@ -95,6 +95,28 @@ PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CLI),,--disable-cli)
> PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CGI),,--disable-cgi)
> PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_FPM),--enable-fpm,--disable-fpm)
>
> +ifeq ($(BR2_PACKAGE_PHP_SAPI_APACHE),y)
> +PHP_DEPENDENCIES += apache
> +PHP_CONF_OPTS += --with-apxs2=$(STAGING_DIR)/usr/bin/apxs
> +
> +# Enable thread safety option if Apache MPM is event or worker
> +ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT)$(BR2_PACKAGE_APACHE_MPM_WORKER),y)
> +PHP_CONF_OPTS += --enable-maintainer-zts
> +endif
> +
> +# php uses apxs from staging directory to install libphp dynamic library and
> +# update /etc/apache2/httpd.conf through the -a option, here is the full
> +# command line: "apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules'
> +# -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7
> +# This does not work as apxs sets the full path of the library and not the
> +# relative one so remove -a option from apxs call
Isn't the proper solution to add apxs to APACHE_CONFIG_SCRIPTS? Or is the
staging dir encoded in a way that our sed script doesn't find it?
Regards,
Arnout
> +define PHP_REMOVE_APXS_UPDATE_CONF
> + $(SED) 's/-i -a -n php/-i -n php/' $(@D)/configure
> +endef
> +
> +PHP_PRE_CONFIGURE_HOOKS += PHP_REMOVE_APXS_UPDATE_CONF
> +endif
> +
> ### Extensions
> PHP_CONF_OPTS += \
> $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
More information about the buildroot
mailing list