sorry, one more patch
пт, 31 июл. 2020 г. в 07:48, Willy Tarreau <w...@1wt.eu>:
> On Fri, Jul 31, 2020 at 02:13:14AM +0500, ???? ??????? wrote:
> > Hello,
> >
> > I repaired SLZ build.
> >
> > it used to work earlier because of SSL_LIB, SSL_INC variables.
>
> Makes sense indeed, applied now, thanks!
> Willy
>
From 2fd7431ed6e94fb48332e57ae569f194e38c1b11 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipits...@gmail.com>
Date: Fri, 31 Jul 2020 12:57:33 +0500
Subject: [PATCH] BUILD: simplify usage of env defined variables
if SLZ_INC, SLZ_LIB, ZLIB_INC, ZLIB_LIB, ADDLIB, ADDINC are defined
as environment variables they might be picked from Makefile easy.
The same way SSL_LIB, SSL_INC are used.
So let us stop assigning above variables to empty values, that
will let make to pick env variables as is.
---
Makefile | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/Makefile b/Makefile
index 2077ca833..4870d8ee0 100644
--- a/Makefile
+++ b/Makefile
@@ -225,11 +225,6 @@ DEBUG =
# possible.
TRACE =
-#### Additional include and library dirs
-# Redefine this if you want to add some special PATH to include/libs
-ADDINC =
-ADDLIB =
-
#### Specific macro definitions
# Use DEFINE=-Dxxx to set any tunable macro. Anything declared here will appear
# in the build options reported by "haproxy -vv". Use SILENT_DEFINE if you do
@@ -486,16 +481,12 @@ endif
ifneq ($(USE_SLZ),)
# Use SLZ_INC and SLZ_LIB to force path to zlib.h and libz.{a,so} if needed.
-SLZ_INC =
-SLZ_LIB =
OPTIONS_CFLAGS += $(if $(SLZ_INC),-I$(SLZ_INC))
OPTIONS_LDFLAGS += $(if $(SLZ_LIB),-L$(SLZ_LIB)) -lslz
endif
ifneq ($(USE_ZLIB),)
# Use ZLIB_INC and ZLIB_LIB to force path to zlib.h and libz.{a,so} if needed.
-ZLIB_INC =
-ZLIB_LIB =
OPTIONS_CFLAGS += $(if $(ZLIB_INC),-I$(ZLIB_INC))
OPTIONS_LDFLAGS += $(if $(ZLIB_LIB),-L$(ZLIB_LIB)) -lz
endif
--
2.26.2
