[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] tools: add link path flag for local build to pkg-config files

commit 66b4a510b77588570b1fa6a2110c9293d511d0fe
Author:     Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Thu Feb 21 18:36:13 2019 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Tue Mar 12 12:57:13 2019 +0000

    tools: add link path flag for local build to pkg-config files
    The qemu build process is requiring the link path of Xen libraries
    to be specified both with -L and -Wl,-rpath-link. Add the -L flag
    to the local pkg-config files.
    At the same time let the pkg-config files depend on the Makefile
    creating them, too.
    Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
 tools/Rules.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 68f2ed7ce1..f5613f73a7 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -262,7 +262,7 @@ PKG_CONFIG_DIR ?= $(XEN_ROOT)/tools/pkg-config
 PKG_CONFIG_FILTER = $(foreach l,$(PKG_CONFIG_REMOVE),-e 's!\([ ,]\)$(l),!\1!g' 
-e 's![ ,]$(l)$$!!g')
-$(PKG_CONFIG_DIR)/%.pc: %.pc.in Makefile
+$(PKG_CONFIG_DIR)/%.pc: %.pc.in Makefile $(XEN_ROOT)/tools/Rules.mk
        mkdir -p $(PKG_CONFIG_DIR)
        @sed -e 's!@@version@@!$(PKG_CONFIG_VERSION)!g' \
             -e 's!@@prefix@@!$(PKG_CONFIG_PREFIX)!g' \
@@ -271,10 +271,10 @@ $(PKG_CONFIG_DIR)/%.pc: %.pc.in Makefile
             -e 's!@@firmwaredir@@!$(XENFIRMWAREDIR)!g' \
             -e 's!@@libexecbin@@!$(LIBEXEC_BIN)!g' \
             -e 's!@@cflagslocal@@!$(PKG_CONFIG_CFLAGS_LOCAL)!g' \
-            -e 's!@@libsflag@@!-Wl,-rpath-link=!g' \
+            -e 's!@@libsflag@@\([^ ]*\)!-L\1 -Wl,-rpath-link=\1!g' \
             $(PKG_CONFIG_FILTER) < $< > $@
-%.pc: %.pc.in Makefile
+%.pc: %.pc.in Makefile $(XEN_ROOT)/tools/Rules.mk
        @sed -e 's!@@version@@!$(PKG_CONFIG_VERSION)!g' \
             -e 's!@@prefix@@!$(PKG_CONFIG_PREFIX)!g' \
             -e 's!@@incdir@@!$(PKG_CONFIG_INCDIR)!g' \
generated by git-patchbot for /home/xen/git/xen.git#master

Xen-changelog mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.