From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsiPM-0008Ab-MG for qemu-devel@nongnu.org; Wed, 01 Feb 2012 17:12:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RsiPL-00006e-Kp for qemu-devel@nongnu.org; Wed, 01 Feb 2012 17:12:04 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:40163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsiPL-00006T-A7 for qemu-devel@nongnu.org; Wed, 01 Feb 2012 17:12:03 -0500 Received: by pbaa11 with SMTP id a11so1882314pba.4 for ; Wed, 01 Feb 2012 14:12:02 -0800 (PST) Message-ID: <4F29B8AE.4090509@codemonkey.ws> Date: Wed, 01 Feb 2012 16:11:58 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1328036625-32251-1-git-send-email-slyfox@inbox.ru> In-Reply-To: <1328036625-32251-1-git-send-email-slyfox@inbox.ru> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 resend] ./configure: request pkg-config to provide private libs when static linking List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Sergei Trofimovich Cc: Peter Maydell , qemu-devel@nongnu.org, Sergei Trofimovich On 01/31/2012 01:03 PM, Sergei Trofimovich wrote: > From: Sergei Trofimovich > > Added wrapper around pkg-config to allow: > - safe options injection via ${QEMU_PKG_CONFIG_FLAGS} > - spaces in path to pkg-config > > Signed-off-by: Sergei Trofimovich > CC: Peter Maydell Applied. Thanks. Regards, Anthony Liguori > --- > configure | 11 ++++++++--- > 1 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/configure b/configure > index f69e08f..8fd5404 100755 > --- a/configure > +++ b/configure > @@ -234,7 +234,11 @@ ld="${LD-${cross_prefix}ld}" > libtool="${LIBTOOL-${cross_prefix}libtool}" > strip="${STRIP-${cross_prefix}strip}" > windres="${WINDRES-${cross_prefix}windres}" > -pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}" > +pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" > +query_pkg_config() { > + "${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@" > +} > +pkg_config=query_pkg_config > sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}" > > # default flags for all hosts > @@ -553,6 +557,7 @@ for opt do > --static) > static="yes" > LDFLAGS="-static $LDFLAGS" > + QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS" > ;; > --mandir=*) mandir="$optarg" > ;; > @@ -1449,8 +1454,8 @@ fi > ########################################## > # pkg-config probe > > -if ! has $pkg_config; then > - echo "Error: pkg-config binary '$pkg_config' not found" > +if ! has "$pkg_config_exe"; then > + echo "Error: pkg-config binary '$pkg_config_exe' not found" > exit 1 > fi >