forked from pool/haproxy
Marcus Rueckert
c9287944c3
https://www.haproxy.com/blog/announcing-haproxy-2-2/ * [RELEASE] Released version 2.2.0 * MINOR: version: mention that it's an LTS release now * DOC: minor update to coding style file * DOC: update INSTALL with new compiler versions * CLEANUP: ssl: remove unrelevant comment in smp_fetch_ssl_x_keylog() * DOC: configuration: remove obsolete mentions of H2 being converted to HTTP/1.x * BUG/MINOR: connection: See new connection as available only on reuse always * BUG/MEDIUM: connection: Don't consider new private connections as available * BUG/MINOR: backend: Remove CO_FL_SESS_IDLE if a client remains on the last server * MINOR: mux-h1: Improve traces about the splicing - refreshed patches to apply cleanly again: haproxy-1.6.0-makefile_lib.patch haproxy-1.6.0-sec-options.patch - track series file in source rpm OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=221
23 lines
764 B
Diff
23 lines
764 B
Diff
Index: haproxy-2.2/Makefile
|
|
===================================================================
|
|
--- haproxy-2.2.orig/Makefile
|
|
+++ haproxy-2.2/Makefile
|
|
@@ -660,7 +660,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),)
|
|
@@ -679,7 +679,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
|