From 095e9de8b0c290d68d78b538b550a0f4d5b75c03 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 26 Jan 2024 19:36:11 +0100 Subject: [PATCH] BUILD: deviceatlas: remove unneeded depenency on libcurl / libzip These were previously used for the "dadwsch" utility that's no longer part of the addon, so we should not move the CFLAGS/LDFLAGS to the global ones as this adds an undesired dependency on the libcurl and libzip libs. No backport is needed. --- addons/deviceatlas/Makefile.inc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/addons/deviceatlas/Makefile.inc b/addons/deviceatlas/Makefile.inc index 63719bf506..8b29559f22 100644 --- a/addons/deviceatlas/Makefile.inc +++ b/addons/deviceatlas/Makefile.inc @@ -4,19 +4,12 @@ CXX := c++ CXXLIB := -lstdc++ -CURL_CONFIG := curl-config -CURLDIR := $(shell $(CURL_CONFIG) --prefix 2>/dev/null || echo /usr/local) -CURL_INC := $(CURLDIR)/include -CURL_LIB := $(CURLDIR)/lib -CURL_LDFLAGS := $(shell $(CURL_CONFIG) --libs 2>/dev/null || echo -L /usr/local/lib -lcurl) - ifeq ($(DEVICEATLAS_SRC),) OPTIONS_LDFLAGS += -lda else DEVICEATLAS_INC = $(DEVICEATLAS_SRC) DEVICEATLAS_LIB = $(DEVICEATLAS_SRC) -OPTIONS_LDFLAGS += $(CURL_LDFLAGS) -lz -lzip -lpthread -OPTIONS_CFLAGS += -DDATLAS_CURL -DDATLAS_CURLSSET -DDATLAS_GZ -DDATLAS_ZIP +OPTIONS_LDFLAGS += -lpthread OPTIONS_CFLAGS += -I$(DEVICEATLAS_INC) -I$(CURL_INC) ifeq ($(DEVICEATLAS_NOCACHE),) CXXFLAGS := $(OPTIONS_CFLAGS) -std=gnu++11