forked from pool/haproxy
Marcus Rueckert
ecc24395b9
https://www.haproxy.com/blog/announcing-haproxy-2-4/ for all the details see /usr/share/doc/packages/haproxy/CHANGELOG - refreshed patches to apply cleanly again haproxy-1.6.0-makefile_lib.patch haproxy-1.6.0-sec-options.patch lua54.patch OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=244
23 lines
764 B
Diff
23 lines
764 B
Diff
Index: haproxy-2.4/Makefile
|
|
===================================================================
|
|
--- haproxy-2.4.orig/Makefile
|
|
+++ haproxy-2.4/Makefile
|
|
@@ -716,7 +716,7 @@ PCRE_CONFIG := pcre-config
|
|
PCREDIR := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local)
|
|
ifneq ($(PCREDIR),)
|
|
PCRE_INC := $(PCREDIR)/include
|
|
-PCRE_LIB := $(PCREDIR)/lib
|
|
+PCRE_LIB := $(PCREDIR)/$(LIB)
|
|
endif
|
|
|
|
ifeq ($(USE_STATIC_PCRE),)
|
|
@@ -735,7 +735,7 @@ PCRE2_CONFIG := pcre2-config
|
|
PCRE2DIR := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local)
|
|
ifneq ($(PCRE2DIR),)
|
|
PCRE2_INC := $(PCRE2DIR)/include
|
|
-PCRE2_LIB := $(PCRE2DIR)/lib
|
|
+PCRE2_LIB := $(PCRE2DIR)/$(LIB)
|
|
|
|
ifeq ($(PCRE2_WIDTH),)
|
|
PCRE2_WIDTH = 8
|