[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] configure: use pkg-config for o
From: |
Paul Durrant |
Subject: |
Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version |
Date: |
Fri, 24 Mar 2017 16:42:13 +0000 |
> -----Original Message-----
[snip]
> >> That's a change in behaviour that I, and probably others, have long been
> used to. What we really want, presumably, is to have pkg-config just look
> under tools/pkgconfig when querying for the version of xencontrol. Could
> that not be done by simply setting PKG_CONFIG_LIBDIR in QEMU's configure
> script, or would it still mean picking up installed libraries before ones just
> built?
> >
> > I guess this would break qemu's configure badly as it wouldn't find all
> > the other library informations it is looking for via pkg-config.
>
> Aah, wait, you mean just for the Xen query?
>
> This might complicate things for my qemu stubdom plans...
>
How about this patch to QEMU configure?
diff --git a/configure b/configure
index fdf47e4..6ef5980 100755
--- a/configure
+++ b/configure
@@ -1974,6 +1974,10 @@ fi
##########################################
# xen probe
+xen_query_pkg_config() {
+ PKG_CONFIG_LIBDIR= ${pkg_config_exe} "$@"
+}
+
if test "$xen" != "no" ; then
xen_libs="-lxenstore -lxenctrl -lxenguest"
xen_stable_libs="-lxenforeignmemory -lxengnttab -lxenevtchn"
@@ -1997,9 +2001,9 @@ EOF
xen=no
# Xen version via pkg-config (Xen 4.9.0 and newer)
- elif $pkg_config --exists xencontrol ; then
+ elif xen_query_pkg_config --exists xencontrol; then
xen_ctrl_version="$(printf '%d%02d%02d' \
- $($pkg_config --modversion xencontrol | sed 's/\./ /g') )"
+ $(xen_query_pkg_config --modversion xencontrol | sed 's/\./ /g') )"
xen=yes
elif
@@ -2216,8 +2220,8 @@ EOF
if test $xen_ctrl_version -ge 40900 ; then
xen_pc="xencontrol xenstore xenguest xenforeignmemory xengnttab
xenevtchn"
xen_pc="$xen_pc xendevicemodel"
- xen_libs="$($pkg_config --libs $xen_pc)"
- QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags $xen_pc)"
+ xen_libs="$(xen_query_pkg_config --libs $xen_pc)"
+ QEMU_CFLAGS="$QEMU_CFLAGS $(xen_query_pkg_config --cflags $xen_pc)"
elif test $xen_ctrl_version -ge 40701 ; then
libs_softmmu="$xen_stable_libs $libs_softmmu"
fi
This appears to DTRT for me when switching between versions of Xen.
Paul
- Re: [Qemu-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, (continued)
- Re: [Qemu-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Stefano Stabellini, 2017/03/21
- Re: [Qemu-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Juergen Gross, 2017/03/22
- Re: [Qemu-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Stefano Stabellini, 2017/03/22
- Re: [Qemu-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Paul Durrant, 2017/03/24
- Re: [Qemu-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Paul Durrant, 2017/03/24
- Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Juergen Gross, 2017/03/24
- Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Paul Durrant, 2017/03/24
- Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Juergen Gross, 2017/03/24
- Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Juergen Gross, 2017/03/24
- Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Paul Durrant, 2017/03/24
- Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version,
Paul Durrant <=
- Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version, Juergen Gross, 2017/03/24
[Qemu-devel] [PATCH 1/2] xen: use 5 digit xen versions, Juergen Gross, 2017/03/16