From patchwork Mon Oct 12 10:54:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 529025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6AA0714027C for ; Mon, 12 Oct 2015 21:56:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=lIq4ZbKX; dkim-atps=neutral Received: from localhost ([::1]:54430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlaml-0003Oo-2O for incoming@patchwork.ozlabs.org; Mon, 12 Oct 2015 06:56:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlale-0001ll-PZ for qemu-devel@nongnu.org; Mon, 12 Oct 2015 06:55:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zlald-0006HY-VS for qemu-devel@nongnu.org; Mon, 12 Oct 2015 06:55:46 -0400 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:36614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlald-0006HU-QH for qemu-devel@nongnu.org; Mon, 12 Oct 2015 06:55:45 -0400 Received: by pablk4 with SMTP id lk4so151843697pab.3 for ; Mon, 12 Oct 2015 03:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=ZcfVHuIS3A0tyTP5CIaBlbMFmDJcpBhKc6uqK7dMYP8=; b=lIq4ZbKXScOAjKY29qRTR7dBYwf7Fo9LdwvtQhs8F+4Oj7Ct1nQo2cG64SWhTQYPSX taXHdHZ/eYgctbdxEzXjWI9VgZyrTG9QI2k8CHNwRS5b3U1IQSimfVpHFmkQ2941pqZW Ydpet9ey+oJBBvN56fnvDWD2HixiDtE5LYUfxHnaH4262xX0gEqqVkaS+TTF/Tu1qqfT YitLbZG7YdrIK3mFlJfSryAvOnBV0e0WBl6nI6zEf3u4teGHJx34I6nT8cycZ5+ulVP1 1X9JYsAOF6DyKVHWHc8UMHaLlt7nhPQBf0GhQLDPMUtAtAEbt+QRQVqVW2gm++CCpM+2 cUWg== X-Received: by 10.66.122.98 with SMTP id lr2mr33529402pab.146.1444647345279; Mon, 12 Oct 2015 03:55:45 -0700 (PDT) Received: from localhost (APoitiers-257-1-45-161.w90-38.abo.wanadoo.fr. [90.38.220.161]) by smtp.gmail.com with ESMTPSA id uc1sm17785893pab.20.2015.10.12.03.55.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 03:55:44 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Mon, 12 Oct 2015 12:54:58 +0200 Message-Id: <1444647299-28642-3-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444647299-28642-1-git-send-email-marcandre.lureau@redhat.com> References: <1444647299-28642-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22a Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH 2/3] configure: require glib 2.26 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau This allows to use the GLIB_VERSION macros that will help to ensure the newer symbols are not being used (or with compatibility code). Signed-off-by: Marc-André Lureau --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f08327e..1bc832f 100755 --- a/configure +++ b/configure @@ -2843,7 +2843,8 @@ fi ########################################## # glib support probe -glib_req_ver=2.22 +glib_req_ver=2.26 +glib_ver=GLIB_VERSION_2_26 glib_modules=gthread-2.0 if test "$modules" = yes; then glib_modules="$glib_modules gmodule-2.0" @@ -2853,7 +2854,7 @@ for i in $glib_modules; do if $pkg_config --atleast-version=$glib_req_ver $i; then glib_cflags=`$pkg_config --cflags $i` glib_libs=`$pkg_config --libs $i` - CFLAGS="$glib_cflags $CFLAGS" + CFLAGS="$glib_cflags $CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$glib_ver -DGLIB_VERSION_MAX_ALLOWED=$glib_ver" LIBS="$glib_libs $LIBS" libs_qga="$glib_libs $libs_qga" else