From f66b279d870b98dcef2b0fdbd935ad0a7d19ea14 Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Sat, 3 Mar 2018 16:14:17 +0100 Subject: [PATCH 1/2] 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 --- net/haproxy/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 9618fdc3c..c71295649 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) From 4012a6951472ca9102322ff5ee6cd72b2637f67b Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Sat, 3 Mar 2018 17:07:20 +0100 Subject: [PATCH 2/2] haproxy: Change download-URLs to https-variants - change haproxy download-URL to https-variant - change lua download-URL to https-variant Signed-off-by: Christian Lachner --- net/haproxy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index c71295649..4a77b5987 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -13,7 +13,7 @@ PKG_VERSION:=1.7.9 PKG_RELEASE:=02 PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.haproxy.org/download/1.7/src/ +PKG_SOURCE_URL:=https://www.haproxy.org/download/1.7/src/ PKG_HASH:=1072337e54fa188dc6e0cfe3ba4c2200b07082e321cbfe5a0882d85d54db068e PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -32,7 +32,7 @@ endef define Download/lua534 FILE:=lua-5.3.4.tar.gz - URL:=http://www.lua.org/ftp/ + URL:=https://www.lua.org/ftp/ HASH:=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c endef