github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-05 02:11:23 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrn-crashlog: replace ldconfig with pkg-config in Makefile

Browse Source 
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 <gang.c.chen@intel.com>
Reviewed-by: Jin Zhi <zhi.jin@intel.com>
Reviewed-by: Liu Xinwu <xinwu.liu@intel.com>
Acked-by: Zhang Di <di.zhang@intel.com>
This commit is contained in:
CHEN Gang 2018-06-29 16:00:54 +08:00 committed by lijinxia
parent 4eae78cb71
commit 31ebd98797
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/acrn-crashlog/Makefile
View File

@ -20,16 +20,27 @@ export BUILDDIR
export CC export CC
export RM export RM
EXTRA_LIBS = -lsystemd PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):/usr/lib/pkgconfig
LDCNF := $(shell ldconfig -p) PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):/usr/share/pkgconfig
LIB_EXIST = $(findstring libsystemd-journal.so, $(LDCNF)) PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):/usr/local/lib/pkgconfig
ifeq ($(strip $(LIB_EXIST)),libsystemd-journal.so) PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):/usr/local/share/pkgconfig
EXTRA_LIBS = -lsystemd-journal 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 endif
LIB_EXIST = $(findstring libtelemetry.so, $(LDCNF))
ifeq ($(strip $(LIB_EXIST)),libtelemetry.so) PKG_CONFIG := $(shell export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH); \
CFLAGS += -DHAVE_TELEMETRICS_CLIENT pkg-config --libs libtelemetry)
EXTRA_LIBS += -ltelemetry LIB_EXIST := $(findstring ltelemetry, $(PKG_CONFIG))
ifeq ($(strip $(LIB_EXIST)),ltelemetry)
CFLAGS += -DHAVE_TELEMETRICS_CLIENT
EXTRA_LIBS += -ltelemetry
endif endif
export CFLAGS export CFLAGS
export EXTRA_LIBS export EXTRA_LIBS