Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/apache: add optional support for lua
@ 2018-03-30 16:50 Bernd Kuhls
  2018-03-31 18:19 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Bernd Kuhls @ 2018-03-30 16:50 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/apache/apache.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/apache/apache.mk b/package/apache/apache.mk
index eaf7b9c5bf..3b39be4a40 100644
--- a/package/apache/apache.mk
+++ b/package/apache/apache.mk
@@ -40,7 +40,6 @@ APACHE_CONF_OPTS = \
 	--without-suexec-bin \
 	--enable-mods-shared=all \
 	--with-mpm=$(APACHE_MPM) \
-	--disable-lua \
 	--disable-luajit
 
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
@@ -57,6 +56,15 @@ APACHE_CONF_OPTS += \
 	--disable-proxy-html
 endif
 
+ifeq ($(BR2_PACKAGE_LUA),y)
+APACHE_CONF_OPTS += \
+	--enable-lua \
+	--with-lua=$(STAGING_DIR)/usr
+APACHE_DEPENDENCIES += lua
+else
+APACHE_CONF_OPTS += --disable-lua
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 APACHE_DEPENDENCIES += openssl
 APACHE_CONF_OPTS += \
-- 
2.14.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH 1/1] package/apache: add optional support for lua
  2018-03-30 16:50 [Buildroot] [PATCH 1/1] package/apache: add optional support for lua Bernd Kuhls
@ 2018-03-31 18:19 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2018-03-31 18:19 UTC (permalink / raw)
  To: buildroot

Hello,

On Fri, 30 Mar 2018 18:50:36 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/apache/apache.mk | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-03-31 18:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-30 16:50 [Buildroot] [PATCH 1/1] package/apache: add optional support for lua Bernd Kuhls
2018-03-31 18:19 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox