[Qemu-devel] [PATCH] buildsys: Move brlapi libs to per object

Fam Zheng posted 1 patch 6 years, 6 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170907084700.952-1-famz@redhat.com
Test checkpatch passed
Test docker passed
Test s390x passed
chardev/Makefile.objs | 1 +
configure             | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[Qemu-devel] [PATCH] buildsys: Move brlapi libs to per object
Posted by Fam Zheng 6 years, 6 months ago
baum.o already receives the sdl cflags in its per object variable, do
the same for brlapi libs to avoid cluttering libs_softmmu.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 chardev/Makefile.objs | 1 +
 configure             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs
index 52a8127606..d68e1347f9 100644
--- a/chardev/Makefile.objs
+++ b/chardev/Makefile.objs
@@ -20,5 +20,6 @@ chardev-obj-$(CONFIG_WIN32) += char-win-stdio.o
 common-obj-y += msmouse.o wctablet.o testdev.o
 common-obj-$(CONFIG_BRLAPI) += baum.o
 baum.o-cflags := $(SDL_CFLAGS)
+baum.o-libs := $(BRLAPI_LIBS)
 
 common-obj-$(CONFIG_SPICE) += spice.o
diff --git a/configure b/configure
index fb7e34a901..d718718cfa 100755
--- a/configure
+++ b/configure
@@ -3106,7 +3106,6 @@ int main( void ) { return brlapi__openConnection (NULL, NULL, NULL); }
 EOF
   if compile_prog "" "$brlapi_libs" ; then
     brlapi=yes
-    libs_softmmu="$brlapi_libs $libs_softmmu"
   else
     if test "$brlapi" = "yes" ; then
       feature_not_found "brlapi" "Install brlapi devel"
@@ -5693,6 +5692,7 @@ if test "$curl" = "yes" ; then
 fi
 if test "$brlapi" = "yes" ; then
   echo "CONFIG_BRLAPI=y" >> $config_host_mak
+  echo "BRLAPI_LIBS=$brlapi_libs" >> $config_host_mak
 fi
 if test "$bluez" = "yes" ; then
   echo "CONFIG_BLUEZ=y" >> $config_host_mak
-- 
2.13.5


Re: [Qemu-devel] [PATCH] buildsys: Move brlapi libs to per object
Posted by Philippe Mathieu-Daudé 6 years, 6 months ago
On 09/07/2017 05:47 AM, Fam Zheng wrote:
> baum.o already receives the sdl cflags in its per object variable, do
> the same for brlapi libs to avoid cluttering libs_softmmu.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>   chardev/Makefile.objs | 1 +
>   configure             | 2 +-
>   2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs
> index 52a8127606..d68e1347f9 100644
> --- a/chardev/Makefile.objs
> +++ b/chardev/Makefile.objs
> @@ -20,5 +20,6 @@ chardev-obj-$(CONFIG_WIN32) += char-win-stdio.o
>   common-obj-y += msmouse.o wctablet.o testdev.o
>   common-obj-$(CONFIG_BRLAPI) += baum.o
>   baum.o-cflags := $(SDL_CFLAGS)
> +baum.o-libs := $(BRLAPI_LIBS)
>   
>   common-obj-$(CONFIG_SPICE) += spice.o
> diff --git a/configure b/configure
> index fb7e34a901..d718718cfa 100755
> --- a/configure
> +++ b/configure
> @@ -3106,7 +3106,6 @@ int main( void ) { return brlapi__openConnection (NULL, NULL, NULL); }
>   EOF
>     if compile_prog "" "$brlapi_libs" ; then
>       brlapi=yes
> -    libs_softmmu="$brlapi_libs $libs_softmmu"
>     else
>       if test "$brlapi" = "yes" ; then
>         feature_not_found "brlapi" "Install brlapi devel"
> @@ -5693,6 +5692,7 @@ if test "$curl" = "yes" ; then
>   fi
>   if test "$brlapi" = "yes" ; then
>     echo "CONFIG_BRLAPI=y" >> $config_host_mak
> +  echo "BRLAPI_LIBS=$brlapi_libs" >> $config_host_mak
>   fi
>   if test "$bluez" = "yes" ; then
>     echo "CONFIG_BLUEZ=y" >> $config_host_mak
> 

Re: [Qemu-devel] [PATCH] buildsys: Move brlapi libs to per object
Posted by Marc-André Lureau 6 years, 6 months ago

----- Original Message -----
> baum.o already receives the sdl cflags in its per object variable, do
> the same for brlapi libs to avoid cluttering libs_softmmu.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>

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

> ---
>  chardev/Makefile.objs | 1 +
>  configure             | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs
> index 52a8127606..d68e1347f9 100644
> --- a/chardev/Makefile.objs
> +++ b/chardev/Makefile.objs
> @@ -20,5 +20,6 @@ chardev-obj-$(CONFIG_WIN32) += char-win-stdio.o
>  common-obj-y += msmouse.o wctablet.o testdev.o
>  common-obj-$(CONFIG_BRLAPI) += baum.o
>  baum.o-cflags := $(SDL_CFLAGS)
> +baum.o-libs := $(BRLAPI_LIBS)
>  
>  common-obj-$(CONFIG_SPICE) += spice.o
> diff --git a/configure b/configure
> index fb7e34a901..d718718cfa 100755
> --- a/configure
> +++ b/configure
> @@ -3106,7 +3106,6 @@ int main( void ) { return brlapi__openConnection (NULL,
> NULL, NULL); }
>  EOF
>    if compile_prog "" "$brlapi_libs" ; then
>      brlapi=yes
> -    libs_softmmu="$brlapi_libs $libs_softmmu"
>    else
>      if test "$brlapi" = "yes" ; then
>        feature_not_found "brlapi" "Install brlapi devel"
> @@ -5693,6 +5692,7 @@ if test "$curl" = "yes" ; then
>  fi
>  if test "$brlapi" = "yes" ; then
>    echo "CONFIG_BRLAPI=y" >> $config_host_mak
> +  echo "BRLAPI_LIBS=$brlapi_libs" >> $config_host_mak
>  fi
>  if test "$bluez" = "yes" ; then
>    echo "CONFIG_BLUEZ=y" >> $config_host_mak
> --
> 2.13.5
> 
> 

Re: [Qemu-devel] [PATCH] buildsys: Move brlapi libs to per object
Posted by Fam Zheng 6 years, 6 months ago
On Thu, 09/07 16:47, Fam Zheng wrote:
> baum.o already receives the sdl cflags in its per object variable, do
> the same for brlapi libs to avoid cluttering libs_softmmu.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>

Thanks, I'll send a pull request later.

Fam