libstatgrab: Update automake

[people/pmueller/ipfire-2.x.git] / lfs / haproxy

diff --git a/lfs/haproxy b/lfs/haproxy
index bc5ef8021a7e0ae8123a0ae5b28a7f49c962951c..5c522be70c8b9b28791a5f03513a10ba2a1c1d8b 100644 (file)
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1.7
+VER        = 2.2.4
 
 THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 15
+PAK_VER    = 18
 
 DEPS       =
 
@@ -40,6 +40,10 @@ ifeq "$(BUILD_ARCH)" "armv5tel"
        LDFLAGS += -latomic
 endif
 
+ifeq "$(BUILD_ARCH)" "riscv64"
+       LDFLAGS += -latomic
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -48,7 +52,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f0ddf67e2be18cfe1b996f9914cfa67e
+$(DL_FILE)_MD5 = c2717fcff503ef8574cd6395e2ca4d24
 
 install : $(TARGET)
 
@@ -83,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && make $(MAKETUNING) CPU="generic" TARGET="linux-glibc" \
-               USE_LUA=1 USE_OPENSSL=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \
+               USE_LUA=1 USE_OPENSSL=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_ZLIB=1 USE_REGPARM=1 \
                LUA_LIB_NAME="lua" ADDINC="$(CFLAGS)" USE_LINUX_TPROXY=1 ADDLIB="$(LDFLAGS)"
 
        cd $(DIR_APP) && make install-bin install-man PREFIX=/usr