From: David Carlier <dcarlier@deviceatlas.com>
Date: Tue, 28 Mar 2023 05:24:49 +0000 (+0100)
Subject: BUILD: da: extends CFLAGS to support API v3 from 3.1.7 and onwards.
X-Git-Tag: v2.8-dev6~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cec3baa4fad82694edc255183872d2e02cfdaab3;p=thirdparty%2Fhaproxy.git

BUILD: da: extends CFLAGS to support API v3 from 3.1.7 and onwards.

Minor build update to still both support the v2 and v3 api from
the 3.1.7 release which supports a cache but would need a shift
in the HAProxy build not necessary at the moment.
In the second half of the year and for the next major HAProxy release
branch, v2 could be dropped altogether thus the next HAProxy 2.9
major release will contain more changes towards the v3 support
and reminder for the v2 EOL.

To be backported.
---

diff --git a/Makefile b/Makefile
index d99cf78d78..b5d160251c 100644
--- a/Makefile
+++ b/Makefile
@@ -670,7 +670,7 @@ ifneq ($(USE_DEVICEATLAS),)
     OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dac.o
   endif
   OPTIONS_OBJS += addons/deviceatlas/da.o
-  DEVICEATLAS_CFLAGS += $(if $(DEVICEATLAS_INC),-I$(DEVICEATLAS_INC))
+  DEVICEATLAS_CFLAGS += $(if $(DEVICEATLAS_INC),-I$(DEVICEATLAS_INC)) $(if $(DEVICEATLAS_SRC),-DDATLAS_DA_NOCACHE)
 endif
 
 # Use 51DEGREES_SRC and possibly 51DEGREES_INC and 51DEGREES_LIB to force path