From patchwork Fri Mar 24 16:42:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 9643317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 36D9C602C9 for ; Fri, 24 Mar 2017 16:43:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28F6426E48 for ; Fri, 24 Mar 2017 16:43:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D9A726E4F; Fri, 24 Mar 2017 16:43:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 57B1826E16 for ; Fri, 24 Mar 2017 16:43:00 +0000 (UTC) Received: from localhost ([::1]:34088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crSIl-00046W-8W for patchwork-qemu-devel@patchwork.kernel.org; Fri, 24 Mar 2017 12:42:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crSI9-00045v-Fy for qemu-devel@nongnu.org; Fri, 24 Mar 2017 12:42:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crSI3-0005tu-MU for qemu-devel@nongnu.org; Fri, 24 Mar 2017 12:42:21 -0400 Received: from smtp.ctxuk.citrix.com ([185.25.65.24]:17870 helo=SMTP.EU.CITRIX.COM) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1crSI3-0005tD-DC for qemu-devel@nongnu.org; Fri, 24 Mar 2017 12:42:15 -0400 X-IronPort-AV: E=Sophos;i="5.36,215,1486425600"; d="scan'208";a="43078884" From: Paul Durrant To: 'Juergen Gross' , 'Stefano Stabellini' Thread-Topic: [Xen-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version Thread-Index: AQHSnmBsrZeKSZDgm0WcO5EgFCYtz6GX2AsAgACOOACAAOY1AIAFb8IAgADfeQCAAKnQgIAA3zkAgAL/YLD///a2AIAAEP6g///ztgCAAADbgIAAHXmQ Date: Fri, 24 Mar 2017 16:42:13 +0000 Message-ID: <1bd386167cff4ef9a281139afb9308dc@AMSPEX02CL03.citrite.net> References: <20170316141953.16161-1-jgross@suse.com> <20170316141953.16161-3-jgross@suse.com> <214bc24d-1c0c-16d6-9c33-e20962b150d2@suse.com> <2fb1da9d14c14eb4826a87657f7d0eb1@AMSPEX02CL03.citrite.net> <550ea61e-c9ba-5afc-12b5-438a2a57af6e@suse.com> <7208ddd9b76b4196be0a3d3cd12aee71@AMSPEX02CL03.citrite.net> <20f2b3ce-218b-4d61-6af1-8c70b751ed18@suse.com> <0103d60e-cd96-ab48-70fb-f75ba1273f39@suse.com> In-Reply-To: <0103d60e-cd96-ab48-70fb-f75ba1273f39@suse.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 185.25.65.24 Subject: Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] configure: use pkg-config for obtaining xen version X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anthony Perard , "xen-devel@lists.xenproject.org" , "qemu-devel@nongnu.org" , "kraxel@redhat.com" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP > -----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? This appears to DTRT for me when switching between versions of Xen. Paul 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