[Qemu-devel] [PATCH 1/2] build-sys: remove unused GLIB_CFLAGS

[Qemu-devel] [PATCH 1/2] build-sys: remove unused GLIB_CFLAGS

[Marc-André Lureau]

---
 configure | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure b/configure
index 8fa62ad..c831600 100755
--- a/configure
+++ b/configure
@@ -5140,7 +5140,6 @@ fi
 if test "$glib_subprocess" = "yes" ; then
   echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=y" >> $config_host_mak
 fi
-echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
 if test "$gtk" = "yes" ; then
   echo "CONFIG_GTK=y" >> $config_host_mak
   echo "CONFIG_GTKABI=$gtkabi" >> $config_host_mak
-- 
2.10.0

[Qemu-devel] [PATCH 2/2] build-sys: put glib_cflags in QEMU_CFLAGS

[Marc-André Lureau]

This way, overriding CFLAGS on make command line keeps glib-cflags
and doesn't break the build.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index c831600..5412d4f 100755
--- a/configure
+++ b/configure
@@ -2933,7 +2933,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"
+        QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"
         LIBS="$glib_libs $LIBS"
         libs_qga="$glib_libs $libs_qga"
     else
-- 
2.10.0

Re: [Qemu-devel] [PATCH 2/2] build-sys: put glib_cflags in QEMU_CFLAGS

[Paolo Bonzini]

On 25/09/2016 22:57, Marc-André Lureau wrote:
> This way, overriding CFLAGS on make command line keeps glib-cflags
> and doesn't break the build.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index c831600..5412d4f 100755
> --- a/configure
> +++ b/configure
> @@ -2933,7 +2933,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"
> +        QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"
>          LIBS="$glib_libs $LIBS"
>          libs_qga="$glib_libs $libs_qga"
>      else
> 

Queued both, thanks.

Paolo