diff options
Diffstat (limited to '0032-tools-Use-PKG_CONFIG_FILE-instead-of-PKG_CONFIG-vari.patch')
| -rw-r--r-- | 0032-tools-Use-PKG_CONFIG_FILE-instead-of-PKG_CONFIG-vari.patch | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/0032-tools-Use-PKG_CONFIG_FILE-instead-of-PKG_CONFIG-vari.patch b/0032-tools-Use-PKG_CONFIG_FILE-instead-of-PKG_CONFIG-vari.patch new file mode 100644 index 0000000..bfcdd26 --- /dev/null +++ b/0032-tools-Use-PKG_CONFIG_FILE-instead-of-PKG_CONFIG-vari.patch @@ -0,0 +1,98 @@ +From a2adc7fcc22405e81dc11290416e6140bb0244ca Mon Sep 17 00:00:00 2001 +From: Bertrand Marquis <bertrand.marquis@arm.com> +Date: Fri, 3 Mar 2023 08:16:45 +0100 +Subject: [PATCH 32/61] tools: Use PKG_CONFIG_FILE instead of PKG_CONFIG + variable + +Replace PKG_CONFIG variable name with PKG_CONFIG_FILE for the name of +the pkg-config file. +This is preventing a conflict in some build systems where PKG_CONFIG +actually contains the path to the pkg-config executable to use, as the +default assignment in libs.mk is using a weak assignment (?=). + +This problem has been found when trying to build the latest version of +Xen tools using buildroot. + +Fixes: d400dc5729e4 ("tools: tweak tools/libs/libs.mk for being able to support libxenctrl") +Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com> +Reviewed-by: Anthony PERARD <anthony.perard@citrix.com> +master commit: b97e2fe7b9e1f4706693552697239ac2b71efee4 +master date: 2023-02-24 17:44:29 +0000 +--- + tools/libs/ctrl/Makefile | 2 +- + tools/libs/libs.mk | 13 +++++++------ + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile +index 6ff5918798..d3666ae7ff 100644 +--- a/tools/libs/ctrl/Makefile ++++ b/tools/libs/ctrl/Makefile +@@ -47,7 +47,7 @@ CFLAGS += -include $(XEN_ROOT)/tools/config.h + CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE + + LIBHEADER := xenctrl.h xenctrl_compat.h +-PKG_CONFIG := xencontrol.pc ++PKG_CONFIG_FILE := xencontrol.pc + PKG_CONFIG_NAME := Xencontrol + + NO_HEADERS_CHK := y +diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk +index f1554462fb..0e005218e2 100644 +--- a/tools/libs/libs.mk ++++ b/tools/libs/libs.mk +@@ -1,7 +1,7 @@ + # Common Makefile for building a lib. + # + # Variables taken as input: +-# PKG_CONFIG: name of pkg-config file (xen$(LIBNAME).pc if empty) ++# PKG_CONFIG_FILE: name of pkg-config file (xen$(LIBNAME).pc if empty) + # MAJOR: major version of lib (Xen version if empty) + # MINOR: minor version of lib (0 if empty) + +@@ -29,7 +29,8 @@ endif + comma:= , + empty:= + space:= $(empty) $(empty) +-PKG_CONFIG ?= $(LIB_FILE_NAME).pc ++ ++PKG_CONFIG_FILE ?= $(LIB_FILE_NAME).pc + PKG_CONFIG_NAME ?= Xen$(LIBNAME) + PKG_CONFIG_DESC ?= The $(PKG_CONFIG_NAME) library for Xen hypervisor + PKG_CONFIG_VERSION := $(MAJOR).$(MINOR) +@@ -38,13 +39,13 @@ PKG_CONFIG_LIB := $(LIB_FILE_NAME) + PKG_CONFIG_REQPRIV := $(subst $(space),$(comma),$(strip $(foreach lib,$(patsubst ctrl,control,$(USELIBS_$(LIBNAME))),xen$(lib)))) + + ifneq ($(CONFIG_LIBXC_MINIOS),y) +-PKG_CONFIG_INST := $(PKG_CONFIG) ++PKG_CONFIG_INST := $(PKG_CONFIG_FILE) + $(PKG_CONFIG_INST): PKG_CONFIG_PREFIX = $(prefix) + $(PKG_CONFIG_INST): PKG_CONFIG_INCDIR = $(includedir) + $(PKG_CONFIG_INST): PKG_CONFIG_LIBDIR = $(libdir) + endif + +-PKG_CONFIG_LOCAL := $(PKG_CONFIG_DIR)/$(PKG_CONFIG) ++PKG_CONFIG_LOCAL := $(PKG_CONFIG_DIR)/$(PKG_CONFIG_FILE) + + LIBHEADER ?= $(LIB_FILE_NAME).h + LIBHEADERS = $(foreach h, $(LIBHEADER), $(XEN_INCLUDE)/$(h)) +@@ -114,7 +115,7 @@ install: build + $(SYMLINK_SHLIB) lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/lib$(LIB_FILE_NAME).so.$(MAJOR) + $(SYMLINK_SHLIB) lib$(LIB_FILE_NAME).so.$(MAJOR) $(DESTDIR)$(libdir)/lib$(LIB_FILE_NAME).so + for i in $(LIBHEADERS); do $(INSTALL_DATA) $$i $(DESTDIR)$(includedir); done +- $(INSTALL_DATA) $(PKG_CONFIG) $(DESTDIR)$(PKG_INSTALLDIR) ++ $(INSTALL_DATA) $(PKG_CONFIG_FILE) $(DESTDIR)$(PKG_INSTALLDIR) + + .PHONY: uninstall + uninstall: +@@ -134,7 +135,7 @@ clean: + rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS) + rm -f lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(MAJOR) + rm -f headers.chk headers.lst +- rm -f $(PKG_CONFIG) ++ rm -f $(PKG_CONFIG_FILE) + rm -f _paths.h + + .PHONY: distclean +-- +2.40.0 + |