RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Willy Tarreau 2024-01-26 19:36:11 +01:00
parent 5c196f0d8d
commit 095e9de8b0
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/deviceatlas/Makefile.inc
View File

@ -4,19 +4,12 @@
CXX := c++ CXX := c++
CXXLIB := -lstdc++ 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),) ifeq ($(DEVICEATLAS_SRC),)
OPTIONS_LDFLAGS += -lda OPTIONS_LDFLAGS += -lda
else else
DEVICEATLAS_INC = $(DEVICEATLAS_SRC) DEVICEATLAS_INC = $(DEVICEATLAS_SRC)
DEVICEATLAS_LIB = $(DEVICEATLAS_SRC) DEVICEATLAS_LIB = $(DEVICEATLAS_SRC)
OPTIONS_LDFLAGS += $(CURL_LDFLAGS) -lz -lzip -lpthread OPTIONS_LDFLAGS += -lpthread
OPTIONS_CFLAGS += -DDATLAS_CURL -DDATLAS_CURLSSET -DDATLAS_GZ -DDATLAS_ZIP
OPTIONS_CFLAGS += -I$(DEVICEATLAS_INC) -I$(CURL_INC) OPTIONS_CFLAGS += -I$(DEVICEATLAS_INC) -I$(CURL_INC)
ifeq ($(DEVICEATLAS_NOCACHE),) ifeq ($(DEVICEATLAS_NOCACHE),)
CXXFLAGS := $(OPTIONS_CFLAGS) -std=gnu++11 CXXFLAGS := $(OPTIONS_CFLAGS) -std=gnu++11