[PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu

[PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu

[Stewart Hildebrand]

A user may choose to set his/her own PKG_CONFIG_PATH, which is useful in the
case of cross-compiling.  We don't want to completely override the
PKG_CONFIG_PATH, just add to it.

Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>
---
 tools/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/Makefile b/tools/Makefile
index ab7a01e..67977ad 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -232,7 +232,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 	else \
 		enable_trace_backend='' ; \
 	fi ; \
-	PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config \
+	PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} \
 	$$source/configure --enable-xen --target-list=i386-softmmu \
 		$(QEMU_XEN_ENABLE_DEBUG) \
 		$$enable_trace_backend \
-- 
2.7.4

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu

[Ian Jackson]

Stewart Hildebrand writes ("[PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu"):
> A user may choose to set his/her own PKG_CONFIG_PATH, which is useful in the
> case of cross-compiling.  We don't want to completely override the
> PKG_CONFIG_PATH, just add to it.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

This patch should be backported to all applicable trees.

Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu

[Stewart Hildebrand]

> From: Ian Jackson
> Sent: Thursday, April 26, 2018 1:44 PM
> Subject: Re: [PATCH] tools: prepend to PKG_CONFIG_PATH when
> configuring qemu
> 
> Stewart Hildebrand writes ("[PATCH] tools: prepend to PKG_CONFIG_PATH
> when configuring qemu"):
> > A user may choose to set his/her own PKG_CONFIG_PATH, which is useful
> in the
> > case of cross-compiling.  We don't want to completely override the
> > PKG_CONFIG_PATH, just add to it.
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> This patch should be backported to all applicable trees.

The patch appears to apply cleanly to staging-4.10, and applies to staging-4.9 with line offsets.  I did a quick build test with the patch as-is applied to each of these branches, it appears to be valid (staging-4.9, staging-4.10, and staging).  No need to apply it to any earlier trees, I don't think, since PKG_CONFIG_PATH wasn't being set in earlier trees.

Stew

> 
> Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu

[Juergen Gross]

On 26/04/18 19:41, Stewart Hildebrand wrote:
> A user may choose to set his/her own PKG_CONFIG_PATH, which is useful in the
> case of cross-compiling.  We don't want to completely override the
> PKG_CONFIG_PATH, just add to it.
> 
> Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>

Release-acked-by: Juergen Gross <jgross@suse.com>


Juergen

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu

[Ian Jackson]

Juergen Gross writes ("Re: [PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu"):
> On 26/04/18 19:41, Stewart Hildebrand wrote:
> > A user may choose to set his/her own PKG_CONFIG_PATH, which is useful in the
> > case of cross-compiling.  We don't want to completely override the
> > PKG_CONFIG_PATH, just add to it.
> > 
> > Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>
> 
> Release-acked-by: Juergen Gross <jgross@suse.com>

Thanks all.  Applied and queued for backport.

Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu

[Ian Jackson]

Ian Jackson writes ("Re: [PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu"):
> Juergen Gross writes ("Re: [PATCH] tools: prepend to PKG_CONFIG_PATH when configuring qemu"):
> > On 26/04/18 19:41, Stewart Hildebrand wrote:
> > > A user may choose to set his/her own PKG_CONFIG_PATH, which is useful in the
> > > case of cross-compiling.  We don't want to completely override the
> > > PKG_CONFIG_PATH, just add to it.
> > > 
> > > Signed-off-by: Stewart Hildebrand <stewart.hildebrand@dornerworks.com>
> > 
> > Release-acked-by: Juergen Gross <jgross@suse.com>
> 
> Thanks all.  Applied and queued for backport.

I have applied this to staging-4.10 and staging-4.9.  4.8 and earlier
do not mess about with PKG_CONFIG_PATH so that's as far as it needs to
go.

Thanks,
Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel