RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-10 16:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: opentracing: fixed build when using pkg-config utility

Browse Source 
In case the OpenTracing C Wrapper library was installed as part of the
system (ie in a directory that pkg-config considers part of the system),
HAProxy building was not possible because in that case pkg-config did
not set the value of the OT_CFLAGS variable in the addon Makefile.

This resolves GitHub issue #1323.
This commit is contained in:
Miroslav Zagorac 2021-07-29 11:10:08 +02:00 committed by Willy Tarreau
parent 99198546f6
commit 3571111de3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/ot/Makefile
View File

@ -8,6 +8,7 @@ OT_DEFINE =
OT_CFLAGS = OT_CFLAGS =
OT_LDFLAGS = OT_LDFLAGS =
OT_DEBUG_EXT = OT_DEBUG_EXT =
OT_PKGSTAT =
OTC_WRAPPER = opentracing-c-wrapper OTC_WRAPPER = opentracing-c-wrapper
ifneq ($(OT_DEBUG),) ifneq ($(OT_DEBUG),)
@ -16,6 +17,7 @@ OT_DEFINE = -DDEBUG_OT
endif endif
ifeq ($(OT_INC),) ifeq ($(OT_INC),)
OT_PKGSTAT = $(shell pkg-config --exists $(OTC_WRAPPER)$(OT_DEBUG_EXT); echo $$?)
OT_CFLAGS = $(shell pkg-config --silence-errors --cflags $(OTC_WRAPPER)$(OT_DEBUG_EXT)) OT_CFLAGS = $(shell pkg-config --silence-errors --cflags $(OTC_WRAPPER)$(OT_DEBUG_EXT))
else else
ifneq ($(wildcard $(OT_INC)/$(OTC_WRAPPER)/.*),) ifneq ($(wildcard $(OT_INC)/$(OTC_WRAPPER)/.*),)
@ -23,9 +25,15 @@ OT_CFLAGS = -I$(OT_INC) $(if $(OT_DEBUG),-DOTC_DBG_MEM)
endif endif
endif endif
ifeq ($(OT_PKGSTAT),)
ifeq ($(OT_CFLAGS),) ifeq ($(OT_CFLAGS),)
$(error OpenTracing C wrapper : can't find headers) $(error OpenTracing C wrapper : can't find headers)
endif endif
else
ifneq ($(OT_PKGSTAT),0)
$(error OpenTracing C wrapper : can't find package)
endif
endif
ifeq ($(OT_LIB),) ifeq ($(OT_LIB),)
OT_LDFLAGS = $(shell pkg-config --silence-errors --libs $(OTC_WRAPPER)$(OT_DEBUG_EXT)) OT_LDFLAGS = $(shell pkg-config --silence-errors --libs $(OTC_WRAPPER)$(OT_DEBUG_EXT))