From: Ryan Keane Date: Tue, 26 Nov 2024 09:38:23 +0000 (-0800) Subject: haproxy: Require lua 5.4 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f4c508fdce9c86bac82987837cdb6c65cb458dcb;p=feed%2Fpackages.git haproxy: Require lua 5.4 Upstream installation guide use lua 5.4, let's follow it. Link: https://github.com/haproxy/haproxy/blob/master/INSTALL Signed-off-by: Ryan Keane --- diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 6d20cea136..84142a2579 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy PKG_VERSION:=3.0.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/3.0/src @@ -46,7 +46,7 @@ endef define Package/haproxy $(call Package/haproxy/Default) TITLE+=with SSL support - DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.3 +libopenssl +libncurses +libreadline +libatomic + DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.4 +libopenssl +libncurses +libreadline +libatomic VARIANT:=ssl endef @@ -59,7 +59,7 @@ define Package/haproxy-nossl $(call Package/haproxy/Default) TITLE+=without SSL support VARIANT:=nossl - DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.3 +libatomic + DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.4 +libatomic CONFLICTS:=haproxy endef @@ -92,7 +92,7 @@ define Build/Compile DESTDIR="$(PKG_INSTALL_DIR)" \ CC="$(TARGET_CC)" \ PCREDIR="$(STAGING_DIR)/usr/" \ - USE_LUA=1 LUA_LIB_NAME="lua5.3" LUA_INC="$(STAGING_DIR)/usr/include/lua5.3" LUA_LIB="$(STAGING_DIR)/usr/lib" \ + USE_LUA=1 LUA_LIB_NAME="lua5.4" LUA_INC="$(STAGING_DIR)/usr/include/lua5.4" LUA_LIB="$(STAGING_DIR)/usr/lib" \ SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530" \ USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_PTHREAD_PSHARED=1 USE_LIBATOMIC=1 USE_PROMEX=1 \ VERSION="$(PKG_VERSION)" SUBVERS="-$(PKG_RELEASE)" \