qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH 2/3] configure: require glib 2.26
Date: Mon, 12 Oct 2015 12:54:58 +0200	[thread overview]
Message-ID: <1444647299-28642-3-git-send-email-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <1444647299-28642-1-git-send-email-marcandre.lureau@redhat.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

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 <marcandre.lureau@redhat.com>
---
 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
-- 
2.4.3

  parent reply	other threads:[~2015-10-12 10:55 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-12 10:54 [Qemu-devel] [PATCH 0/3] Use glib 2.26 version macros marcandre.lureau
2015-10-12 10:54 ` [Qemu-devel] [PATCH 1/3] hw/acpi/aml-build: remove useless glib version check marcandre.lureau
2015-10-12 13:31   ` Marc-André Lureau
2015-10-29  7:28     ` Michael Tokarev
2015-10-12 10:54 ` marcandre.lureau [this message]
2015-10-12 10:54 ` [Qemu-devel] [PATCH 3/3] Remove glib < 2.26 compatibility code marcandre.lureau
2015-10-12 11:18 ` [Qemu-devel] [PATCH 0/3] Use glib 2.26 version macros Cornelia Huck
2015-10-12 11:26 ` Daniel P. Berrange
2015-10-12 12:24   ` Marc-André Lureau
2015-10-12 12:31     ` Daniel P. Berrange
2015-10-12 12:38       ` Peter Maydell
2015-10-12 16:02         ` John Snow
2015-10-12 16:34         ` Dr. David Alan Gilbert
2015-10-12 17:10           ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444647299-28642-3-git-send-email-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).