1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH] buildsys: Move seccomp cflags/libs to per object

Fam Zheng posted 1 patch 6 years, 7 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170907085316.8861-1-famz@redhat.com
Test checkpatch passed
Test docker passed
Test s390x passed
Makefile.objs | 2 ++
configure     | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
[Qemu-devel] [PATCH] buildsys: Move seccomp cflags/libs to per object
Posted by Fam Zheng 6 years, 7 months ago 
Like many other libraries, libseccomp cflags and libs should only apply
to the building of necessary objects. Do so in the usual way with the
help of per object variables.

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

diff --git a/Makefile.objs b/Makefile.objs
index 24a4ea08b8..d9cf7ad791 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -70,6 +70,8 @@ common-obj-y += backends/
 common-obj-y += chardev/
 
 common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
+qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS)
+qemu-seccomp.o-libs := $(SECCOMP_LIBS)
 
 common-obj-$(CONFIG_FDT) += device_tree.o
 
diff --git a/configure b/configure
index fb7e34a901..fb81a0189b 100755
--- a/configure
+++ b/configure
@@ -2052,8 +2052,8 @@ if test "$seccomp" != "no" ; then
 
     if test "$libseccomp_minver" != "" &&
        $pkg_config --atleast-version=$libseccomp_minver libseccomp ; then
-        libs_softmmu="$libs_softmmu $($pkg_config --libs libseccomp)"
-        QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags libseccomp)"
+        seccomp_cflags="$($pkg_config --cflags libseccomp)"
+        seccomp_libs="$($pkg_config --libs libseccomp)"
         seccomp="yes"
     else
         if test "$seccomp" = "yes" ; then
@@ -5875,6 +5875,8 @@ fi
 
 if test "$seccomp" = "yes"; then
   echo "CONFIG_SECCOMP=y" >> $config_host_mak
+  echo "SECCOMP_CFLAGS=$seccomp_cflags" >> $config_host_mak
+  echo "SECCOMP_LIBS=$seccomp_libs" >> $config_host_mak
 fi
 
 # XXX: suppress that
-- 
2.13.5
Re: [Qemu-devel] [PATCH] buildsys: Move seccomp cflags/libs to per object
Posted by Philippe Mathieu-Daudé 6 years, 7 months ago 
On 09/07/2017 05:53 AM, Fam Zheng wrote:
> Like many other libraries, libseccomp cflags and libs should only apply
> to the building of necessary objects. Do so in the usual way with the
> help of per object variables.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>

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

> ---
>   Makefile.objs | 2 ++
>   configure     | 6 ++++--
>   2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.objs b/Makefile.objs
> index 24a4ea08b8..d9cf7ad791 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -70,6 +70,8 @@ common-obj-y += backends/
>   common-obj-y += chardev/
>   
>   common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
> +qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS)
> +qemu-seccomp.o-libs := $(SECCOMP_LIBS)
>   
>   common-obj-$(CONFIG_FDT) += device_tree.o
>   
> diff --git a/configure b/configure
> index fb7e34a901..fb81a0189b 100755
> --- a/configure
> +++ b/configure
> @@ -2052,8 +2052,8 @@ if test "$seccomp" != "no" ; then
>   
>       if test "$libseccomp_minver" != "" &&
>          $pkg_config --atleast-version=$libseccomp_minver libseccomp ; then
> -        libs_softmmu="$libs_softmmu $($pkg_config --libs libseccomp)"
> -        QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags libseccomp)"
> +        seccomp_cflags="$($pkg_config --cflags libseccomp)"
> +        seccomp_libs="$($pkg_config --libs libseccomp)"
>           seccomp="yes"
>       else
>           if test "$seccomp" = "yes" ; then
> @@ -5875,6 +5875,8 @@ fi
>   
>   if test "$seccomp" = "yes"; then
>     echo "CONFIG_SECCOMP=y" >> $config_host_mak
> +  echo "SECCOMP_CFLAGS=$seccomp_cflags" >> $config_host_mak
> +  echo "SECCOMP_LIBS=$seccomp_libs" >> $config_host_mak
>   fi
>   
>   # XXX: suppress that
>
Re: [Qemu-devel] [PATCH] buildsys: Move seccomp cflags/libs to per object
Posted by Eduardo Otubo 6 years, 7 months ago 
On Thu, Sep 07, 2017 at 04:53:16PM +0800, Fam Zheng wrote:
> Like many other libraries, libseccomp cflags and libs should only apply
> to the building of necessary objects. Do so in the usual way with the
> help of per object variables.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>

I'll include in the next pull request. Thanks for the patch.

Acked-by: Eduardo Otubo <otubo@redhat.com>

> ---
>  Makefile.objs | 2 ++
>  configure     | 6 ++++--
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.objs b/Makefile.objs
> index 24a4ea08b8..d9cf7ad791 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -70,6 +70,8 @@ common-obj-y += backends/
>  common-obj-y += chardev/
>  
>  common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
> +qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS)
> +qemu-seccomp.o-libs := $(SECCOMP_LIBS)
>  
>  common-obj-$(CONFIG_FDT) += device_tree.o
>  
> diff --git a/configure b/configure
> index fb7e34a901..fb81a0189b 100755
> --- a/configure
> +++ b/configure
> @@ -2052,8 +2052,8 @@ if test "$seccomp" != "no" ; then
>  
>      if test "$libseccomp_minver" != "" &&
>         $pkg_config --atleast-version=$libseccomp_minver libseccomp ; then
> -        libs_softmmu="$libs_softmmu $($pkg_config --libs libseccomp)"
> -        QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags libseccomp)"
> +        seccomp_cflags="$($pkg_config --cflags libseccomp)"
> +        seccomp_libs="$($pkg_config --libs libseccomp)"
>          seccomp="yes"
>      else
>          if test "$seccomp" = "yes" ; then
> @@ -5875,6 +5875,8 @@ fi
>  
>  if test "$seccomp" = "yes"; then
>    echo "CONFIG_SECCOMP=y" >> $config_host_mak
> +  echo "SECCOMP_CFLAGS=$seccomp_cflags" >> $config_host_mak
> +  echo "SECCOMP_LIBS=$seccomp_libs" >> $config_host_mak
>  fi
>  
>  # XXX: suppress that
> -- 
> 2.13.5
> 
> 

-- 
Eduardo Otubo
Senior Software Engineer @ RedHat
Re: [Qemu-devel] [PATCH] buildsys: Move seccomp cflags/libs to per object
Posted by Fam Zheng 6 years, 7 months ago 
On Fri, 09/08 10:10, Eduardo Otubo wrote:
> On Thu, Sep 07, 2017 at 04:53:16PM +0800, Fam Zheng wrote:
> > Like many other libraries, libseccomp cflags and libs should only apply
> > to the building of necessary objects. Do so in the usual way with the
> > help of per object variables.
> > 
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> 
> I'll include in the next pull request. Thanks for the patch.

Great, thanks!

Fam

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.