haproxy: Fix Lua-support on non-mips(el) targets.
authorChristian Lachner <gladiac@gmail.com>
Sat, 3 Mar 2018 15:14:17 +0000 (16:14 +0100)
committerChristian Lachner <gladiac@gmail.com>
Sat, 3 Mar 2018 15:14:17 +0000 (16:14 +0100)
- 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>
net/haproxy/Makefile

index 9618fdc3ce2f9e69b79251ddfd4dc910bd9aa18a..c712956497cf5700a5376a929a6b3bccbfcce064 100644 (file)
@@ -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)