From: Christian Lachner <gladiac@gmail.com>
Date: Sat, 3 Mar 2018 15:14:17 +0000 (+0100)
Subject: haproxy: Fix Lua-support on non-mips(el) targets.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f66b279d870b98dcef2b0fdbd935ad0a7d19ea14;p=feed%2Fpackages.git

haproxy: Fix Lua-support on non-mips(el) targets.
- the Lua-support logic was cleaned up to unbreak Lua-support on non-mips(el) targets. Previously, no target had Lua-support.
- mips and mipsel are both known to currently not build with Lua-support enabled => disable both.
- mips64 and mips64el were tested fine with Lua-support enabled.

Signed-off-by: Christian Lachner <gladiac@gmail.com>
---

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 9618fdc3ce..c712956497 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -95,6 +95,9 @@ ENABLE_LUA:=y
 ifeq ($(CONFIG_mips),y)
   ENABLE_LUA:=n
 endif
+ifeq ($(CONFIG_mipsel),y)
+  ENABLE_LUA:=n
+endif
 
 ifeq ($(CONFIG_avr32),y)
   LINUX_TARGET:=linux26
@@ -105,13 +108,13 @@ endif
 ifeq ($(BUILD_VARIANT),ssl)
 	ADDON+=USE_OPENSSL=1
 	ADDON+=ADDLIB="-lcrypto -lm "
-else ifeq ($(CONFIG_mips),n)
+endif
+
+ifeq ($(ENABLE_LUA),y)
 	ADDON+=USE_LUA=1
 	ADDON+=LUA_LIB_NAME="lua534"
 	ADDON+=LUA_INC="$(STAGING_DIR)/lua-5.3.4/include"
 	ADDON+=LUA_LIB="$(STAGING_DIR)/lua-5.3.4/lib"
-else
-	ADDON+=ADDLIB="-lm"
 endif
 
 ifeq ($(ENABLE_LUA),y)