From 78d99efb9b21da30ff6ee32a79876cdaa0a2113b Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Mon, 27 Jul 2020 21:24:38 +0200 Subject: haproxy: Update HAProxy to v2.2.1 - New major version (LTS release) - Update haproxy download URL and hash - Remove obsolete dladdr1-dependency-patch as it has been upstreamed - USE_REGPARM is obsolete and therefore removed from our Makefile Signed-off-by: Christian Lachner --- net/haproxy/Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'net/haproxy/Makefile') diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index ca86759b8..23306e92a 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.1.7 +PKG_VERSION:=2.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://www.haproxy.org/download/2.1/src -PKG_HASH:=392e6cf18e75fe7e166102e8c4512942890a0b5ae738f6064faab4687f60a339 +PKG_SOURCE_URL:=https://www.haproxy.org/download/2.2/src +PKG_HASH:=536552af1316807c01de727ad3dac84b3a2f5285db32e9bfdfe234e47ff9d124 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner @@ -79,11 +79,6 @@ $(call Package/haproxy/Default/description) endef ENABLE_LUA:=y -ENABLE_REGPARM:=n - -ifeq ($(CONFIG_TARGET_x86),y) - ENABLE_REGPARM:=y -endif ifeq ($(CONFIG_USE_UCLIBC),y) ADDON+=USE_LIBCRYPT= @@ -94,10 +89,6 @@ ifeq ($(BUILD_VARIANT),ssl) ADDON+=ADDLIB="-lcrypto -lm" endif -ifeq ($(ENABLE_REGPARM),y) - ADDON+=USE_REGPARM=1 -endif - define Build/Compile $(MAKE) TARGET=linux-glibc -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ -- cgit v1.2.3