From 31ebd987979a236e40078837547639c5772e7e66 Mon Sep 17 00:00:00 2001 From: CHEN Gang Date: Fri, 29 Jun 2018 16:00:54 +0800 Subject: [PATCH] tools: acrn-crashlog: replace ldconfig with pkg-config in Makefile This patch is to fix the dependency issue with autospec. Using ldconfig in the autospec build environment is not going to work as the packages do not have the cache generate after a rpm install. This patch replaces ldconfig with pkg-config to check the existance of the libraries. Signed-off-by: CHEN Gang Reviewed-by: Jin Zhi Reviewed-by: Liu Xinwu Acked-by: Zhang Di --- tools/acrn-crashlog/Makefile | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/tools/acrn-crashlog/Makefile b/tools/acrn-crashlog/Makefile index 12d704d9b..61af517d1 100644 --- a/tools/acrn-crashlog/Makefile +++ b/tools/acrn-crashlog/Makefile @@ -20,16 +20,27 @@ export BUILDDIR export CC export RM -EXTRA_LIBS = -lsystemd -LDCNF := $(shell ldconfig -p) -LIB_EXIST = $(findstring libsystemd-journal.so, $(LDCNF)) -ifeq ($(strip $(LIB_EXIST)),libsystemd-journal.so) - EXTRA_LIBS = -lsystemd-journal +PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):/usr/lib/pkgconfig +PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):/usr/share/pkgconfig +PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):/usr/local/lib/pkgconfig +PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):/usr/local/share/pkgconfig +PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):/usr/lib32/pkgconfig +PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):/usr/lib64/pkgconfig + +EXTRA_LIBS = -lsystemd-journal +PKG_CONFIG := $(shell export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH); \ + pkg-config --libs libsystemd) +LIB_EXIST := $(findstring lsystemd, $(PKG_CONFIG)) +ifeq ($(strip $(LIB_EXIST)),lsystemd) + EXTRA_LIBS := -lsystemd endif -LIB_EXIST = $(findstring libtelemetry.so, $(LDCNF)) -ifeq ($(strip $(LIB_EXIST)),libtelemetry.so) - CFLAGS += -DHAVE_TELEMETRICS_CLIENT - EXTRA_LIBS += -ltelemetry + +PKG_CONFIG := $(shell export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH); \ + pkg-config --libs libtelemetry) +LIB_EXIST := $(findstring ltelemetry, $(PKG_CONFIG)) +ifeq ($(strip $(LIB_EXIST)),ltelemetry) + CFLAGS += -DHAVE_TELEMETRICS_CLIENT + EXTRA_LIBS += -ltelemetry endif export CFLAGS export EXTRA_LIBS