OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

haproxy: disable lua on mips 

- to fix  #4606 we disable to lua build for haproxy
   depending on CONFIG_mips = y

Signed-off-by: Thomas Heil <heil@terminal-consulting.de>
This commit is contained in:
Thomas Heil 2017-10-15 18:48:29 +02:00
parent 1feb0bae0f
commit 2ef52e041b
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net/haproxy/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=haproxy PKG_NAME:=haproxy
PKG_VERSION:=1.7.9 PKG_VERSION:=1.7.9
PKG_RELEASE:=01 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:=http://www.haproxy.org/download/1.7/src/
@ -38,8 +38,10 @@ endef
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
ifeq ($(ENABLE_LUA),y)
tar -zxvf $(DL_DIR)/lua-5.3.4.tar.gz -C $(PKG_BUILD_DIR) tar -zxvf $(DL_DIR)/lua-5.3.4.tar.gz -C $(PKG_BUILD_DIR)
ln -s $(PKG_BUILD_DIR)/lua-5.3.4 $(PKG_BUILD_DIR)/lua ln -s $(PKG_BUILD_DIR)/lua-5.3.4 $(PKG_BUILD_DIR)/lua
endif
endef endef
define Package/haproxy/Default/conffiles define Package/haproxy/Default/conffiles
@ -89,6 +91,11 @@ $(call Package/haproxy/Default/description)
This package is built without SSL support. This package is built without SSL support.
endef endef
ENABLE_LUA:=y
ifeq ($(CONFIG_mips),y)
ENABLE_LUA:=n
endif
ifeq ($(CONFIG_avr32),y) ifeq ($(CONFIG_avr32),y)
LINUX_TARGET:=linux26 LINUX_TARGET:=linux26
else else
@ -97,17 +104,18 @@ endif
ifeq ($(BUILD_VARIANT),ssl) ifeq ($(BUILD_VARIANT),ssl)
ADDON+=USE_OPENSSL=1 ADDON+=USE_OPENSSL=1
ADDON+=ADDLIB="-lcrypto -lm "
else ifeq ($(CONFIG_mips),n)
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"
ADDON+=ADDLIB="-lcrypto -lm "
else else
ADDON+=ADDLIB="-lm" ADDON+=ADDLIB="-lm"
endif endif
ifeq ($(ENABLE_LUA),y)
define Build/Compile define Build/Compile/lua
$(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR)/lua \ $(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR)/lua \
INSTALL_TOP="$(STAGING_DIR)/lua-5.3.4/" \ INSTALL_TOP="$(STAGING_DIR)/lua-5.3.4/" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
@ -117,7 +125,11 @@ define Build/Compile
linux install linux install
mv $(STAGING_DIR)/lua-5.3.4/lib/liblua.a $(STAGING_DIR)/lua-5.3.4/lib/liblua534.a mv $(STAGING_DIR)/lua-5.3.4/lib/liblua.a $(STAGING_DIR)/lua-5.3.4/lib/liblua534.a
endef
endif
define Build/Compile
$(call Build/Compile/lua)
$(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR) \ $(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
@ -160,7 +172,6 @@ endef
Package/haproxy-nossl/install = $(Package/haproxy/install) Package/haproxy-nossl/install = $(Package/haproxy/install)
define Package/halog define Package/halog
MENU:=1 MENU:=1
$(call Package/haproxy) $(call Package/haproxy)