Marcus Rueckert
e675ce1878
- Readd USE_RELRO_NOW=1, USE_STACKPROTECTOR=1, USE_PIE=1
- adapt haproxy-1.6.0-sec-options.patch so the build no longer
complains about unused options
- drop CPU="%{_target_cpu}" as it is unused
- migrate to DEBUG_CFLAGS to OPT_CFLAGS
OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=346
23 lines
812 B
Diff
23 lines
812 B
Diff
Index: haproxy-3.2/Makefile
|
|
===================================================================
|
|
--- haproxy-3.2.orig/Makefile
|
|
+++ haproxy-3.2/Makefile
|
|
@@ -794,7 +794,7 @@ ifneq ($(USE_PCRE:0=)$(USE_STATIC_PCRE:0
|
|
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
|
|
|
|
PCRE_CFLAGS := $(if $(PCRE_INC),-I$(PCRE_INC))
|
|
@@ -812,7 +812,7 @@ ifneq ($(USE_PCRE2:0=)$(USE_STATIC_PCRE2
|
|
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
|