Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5708 from gladiac1337/master

Browse source 
haproxy: Fix Lua-support on non-mips(el) targets.
This commit is contained in:
Thomas Heil 2018-03-04 15:51:35 +01:00 committed by GitHub
commit 906dbf43f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
net/haproxy/Makefile
View file

@ -13,7 +13,7 @@ PKG_VERSION:=1.7.9
PKG_RELEASE:=02 PKG_RELEASE:=02
PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz 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_HASH:=1072337e54fa188dc6e0cfe3ba4c2200b07082e321cbfe5a0882d85d54db068e
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
@ -32,7 +32,7 @@ endef
define Download/lua534 define Download/lua534
FILE:=lua-5.3.4.tar.gz FILE:=lua-5.3.4.tar.gz
URL:=http://www.lua.org/ftp/ URL:=https://www.lua.org/ftp/
HASH:=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c HASH:=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c
endef endef
@ -95,6 +95,9 @@ ENABLE_LUA:=y
ifeq ($(CONFIG_mips),y) ifeq ($(CONFIG_mips),y)
ENABLE_LUA:=n ENABLE_LUA:=n
endif endif
ifeq ($(CONFIG_mipsel),y)
ENABLE_LUA:=n
endif
ifeq ($(CONFIG_avr32),y) ifeq ($(CONFIG_avr32),y)
LINUX_TARGET:=linux26 LINUX_TARGET:=linux26
@ -105,13 +108,13 @@ endif
ifeq ($(BUILD_VARIANT),ssl) ifeq ($(BUILD_VARIANT),ssl)
ADDON+=USE_OPENSSL=1 ADDON+=USE_OPENSSL=1
ADDON+=ADDLIB="-lcrypto -lm " ADDON+=ADDLIB="-lcrypto -lm "
else ifeq ($(CONFIG_mips),n) endif
ifeq ($(ENABLE_LUA),y)
ADDON+=USE_LUA=1 ADDON+=USE_LUA=1
ADDON+=LUA_LIB_NAME="lua534" ADDON+=LUA_LIB_NAME="lua534"
ADDON+=LUA_INC="$(STAGING_DIR)/lua-5.3.4/include" ADDON+=LUA_INC="$(STAGING_DIR)/lua-5.3.4/include"
ADDON+=LUA_LIB="$(STAGING_DIR)/lua-5.3.4/lib" ADDON+=LUA_LIB="$(STAGING_DIR)/lua-5.3.4/lib"
else
ADDON+=ADDLIB="-lm"
endif endif
ifeq ($(ENABLE_LUA),y) ifeq ($(ENABLE_LUA),y)