[Qemu-devel] [PATCH] build: expose and use GLIB_LIBS and GLIB_CFLAGS

[Qemu-devel] [PATCH] build: expose and use GLIB_LIBS and GLIB_CFLAGS

[Michael Tokarev]

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 configure |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 25d59f9..49b840b 100755
--- a/configure
+++ b/configure
@@ -2619,9 +2619,6 @@ 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"
-        LIBS="$glib_libs $LIBS"
-        libs_qga="$glib_libs $libs_qga"
     else
         error_exit "glib-$glib_req_ver $i is required to compile QEMU"
     fi
@@ -4081,7 +4078,7 @@ echo "Host C compiler   $host_cc"
 echo "C++ compiler      $cxx"
 echo "Objective-C compiler $objcc"
 echo "ARFLAGS           $ARFLAGS"
-echo "CFLAGS            $CFLAGS"
+echo "CFLAGS            $CFLAGS $GLIB_CFLAGS"
 echo "QEMU_CFLAGS       $QEMU_CFLAGS"
 echo "LDFLAGS           $LDFLAGS"
 echo "make              $make"
@@ -4431,6 +4428,7 @@ if test "$bluez" = "yes" ; then
   echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
 fi
 echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
+echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
 if test "$gtk" = "yes" ; then
   echo "CONFIG_GTK=y" >> $config_host_mak
   echo "CONFIG_GTKABI=$gtkabi" >> $config_host_mak
@@ -4736,7 +4734,7 @@ echo "OBJCOPY=$objcopy" >> $config_host_mak
 echo "LD=$ld" >> $config_host_mak
 echo "WINDRES=$windres" >> $config_host_mak
 echo "LIBTOOL=$libtool" >> $config_host_mak
-echo "CFLAGS=$CFLAGS" >> $config_host_mak
+echo "CFLAGS=$CFLAGS \$(GLIB_CFLAGS)" >> $config_host_mak
 echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak
 echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
 echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $config_host_mak
@@ -4753,12 +4751,12 @@ fi
 echo "LDFLAGS=$LDFLAGS" >> $config_host_mak
 echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
 echo "LIBTOOLFLAGS=$LIBTOOLFLAGS" >> $config_host_mak
-echo "LIBS+=$LIBS" >> $config_host_mak
+echo "LIBS+=$LIBS \$(GLIB_LIBS)" >> $config_host_mak
 echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
 echo "EXESUF=$EXESUF" >> $config_host_mak
 echo "DSOSUF=$DSOSUF" >> $config_host_mak
 echo "LDFLAGS_SHARED=$LDFLAGS_SHARED" >> $config_host_mak
-echo "LIBS_QGA+=$libs_qga" >> $config_host_mak
+echo "LIBS_QGA+=$libs_qga \$(GLIB_LIBS)" >> $config_host_mak
 echo "POD2MAN=$POD2MAN" >> $config_host_mak
 echo "TRANSLATE_OPT_CFLAGS=$TRANSLATE_OPT_CFLAGS" >> $config_host_mak
 if test "$gcov" = "yes" ; then
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH] build: expose and use GLIB_LIBS and GLIB_CFLAGS

[Paolo Bonzini]

Il 08/05/2014 16:39, Michael Tokarev ha scritto:
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
>  configure |   12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/configure b/configure
> index 25d59f9..49b840b 100755
> --- a/configure
> +++ b/configure
> @@ -2619,9 +2619,6 @@ 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"
> -        LIBS="$glib_libs $LIBS"
> -        libs_qga="$glib_libs $libs_qga"
>      else
>          error_exit "glib-$glib_req_ver $i is required to compile QEMU"
>      fi
> @@ -4081,7 +4078,7 @@ echo "Host C compiler   $host_cc"
>  echo "C++ compiler      $cxx"
>  echo "Objective-C compiler $objcc"
>  echo "ARFLAGS           $ARFLAGS"
> -echo "CFLAGS            $CFLAGS"
> +echo "CFLAGS            $CFLAGS $GLIB_CFLAGS"
>  echo "QEMU_CFLAGS       $QEMU_CFLAGS"
>  echo "LDFLAGS           $LDFLAGS"
>  echo "make              $make"
> @@ -4431,6 +4428,7 @@ if test "$bluez" = "yes" ; then
>    echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
>  fi
>  echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
> +echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
>  if test "$gtk" = "yes" ; then
>    echo "CONFIG_GTK=y" >> $config_host_mak
>    echo "CONFIG_GTKABI=$gtkabi" >> $config_host_mak
> @@ -4736,7 +4734,7 @@ echo "OBJCOPY=$objcopy" >> $config_host_mak
>  echo "LD=$ld" >> $config_host_mak
>  echo "WINDRES=$windres" >> $config_host_mak
>  echo "LIBTOOL=$libtool" >> $config_host_mak
> -echo "CFLAGS=$CFLAGS" >> $config_host_mak
> +echo "CFLAGS=$CFLAGS \$(GLIB_CFLAGS)" >> $config_host_mak
>  echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak
>  echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
>  echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $config_host_mak
> @@ -4753,12 +4751,12 @@ fi
>  echo "LDFLAGS=$LDFLAGS" >> $config_host_mak
>  echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
>  echo "LIBTOOLFLAGS=$LIBTOOLFLAGS" >> $config_host_mak
> -echo "LIBS+=$LIBS" >> $config_host_mak
> +echo "LIBS+=$LIBS \$(GLIB_LIBS)" >> $config_host_mak
>  echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
>  echo "EXESUF=$EXESUF" >> $config_host_mak
>  echo "DSOSUF=$DSOSUF" >> $config_host_mak
>  echo "LDFLAGS_SHARED=$LDFLAGS_SHARED" >> $config_host_mak
> -echo "LIBS_QGA+=$libs_qga" >> $config_host_mak
> +echo "LIBS_QGA+=$libs_qga \$(GLIB_LIBS)" >> $config_host_mak
>  echo "POD2MAN=$POD2MAN" >> $config_host_mak
>  echo "TRANSLATE_OPT_CFLAGS=$TRANSLATE_OPT_CFLAGS" >> $config_host_mak
>  if test "$gcov" = "yes" ; then
>

Hmm... not sure what's the benefit. :)

As discussed on IRC, you could dust off the idea of introducing 
LIBS_QEMU (and perhaps ZLIB_CFLAGS/ZLIB_LIBS too), so that $LIBS becomes 
the common part of all binaries.  Glib would end up there, together with 
other system libraries like Solaris's -lresolv and -lnsl (see 
solarisnetlibs).

Paolo