qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
	"Daniel P . Berrange" <berrange@redhat.com>,
	"Connor Kuehl" <ckuehl@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	virtio-fs@redhat.com, "Stefan Hajnoczi" <stefanha@redhat.com>,
	"Mahmoud Mandour" <ma.mandourr@gmail.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 1/2] meson: Check for seccomp/cap-ng libraries if virtiofsd is enabled
Date: Wed, 28 Apr 2021 16:48:12 +0200	[thread overview]
Message-ID: <20210428144813.417170-2-philmd@redhat.com> (raw)
In-Reply-To: <20210428144813.417170-1-philmd@redhat.com>

When not explicitly select a sysemu target and building virtiofsd,
the seccomp/cap-ng libraries are not resolved, leading to this error:

  $ configure --target-list=i386-linux-user --disable-tools --enable-virtiofsd
  tools/meson.build:12:6: ERROR: Problem encountered: virtiofsd requires libcap-ng-devel and seccomp-devel

Fix by checking the seccomp/cap-ng libraries if virtiofsd is built.

Reported-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index c6f4b0cf5e8..b466b418fed 100644
--- a/meson.build
+++ b/meson.build
@@ -393,14 +393,14 @@
 endif
 
 seccomp = not_found
-if not get_option('seccomp').auto() or have_system or have_tools
+if not get_option('seccomp').auto() or have_system or have_tools or not get_option('virtiofsd').auto()
   seccomp = dependency('libseccomp', version: '>=2.3.0',
                        required: get_option('seccomp'),
                        method: 'pkg-config', kwargs: static_kwargs)
 endif
 
 libcap_ng = not_found
-if not get_option('cap_ng').auto() or have_system or have_tools
+if not get_option('cap_ng').auto() or have_system or have_tools or not get_option('virtiofsd').auto()
   libcap_ng = cc.find_library('cap-ng', has_headers: ['cap-ng.h'],
                               required: get_option('cap_ng'),
                               kwargs: static_kwargs)
-- 
2.26.3



  reply	other threads:[~2021-04-28 14:54 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-28 14:48 [PATCH 0/2] virtiofsd: Meson build fixes Philippe Mathieu-Daudé
2021-04-28 14:48 ` Philippe Mathieu-Daudé [this message]
2021-04-28 15:06   ` [PATCH 1/2] meson: Check for seccomp/cap-ng libraries if virtiofsd is enabled Peter Maydell
2021-04-28 15:34     ` Philippe Mathieu-Daudé
2021-04-28 16:34   ` Richard Henderson
2021-04-28 18:00     ` Philippe Mathieu-Daudé
2021-04-28 18:36       ` Peter Maydell
2021-04-29  7:31       ` Philippe Mathieu-Daudé
2021-04-28 14:48 ` [PATCH 2/2] util/meson: Build iov/hexdump/buffer_is_zero with virtiofsd Philippe Mathieu-Daudé
2021-04-28 14:52   ` Philippe Mathieu-Daudé
2021-04-28 16:38   ` Richard Henderson
2021-04-28 17:56     ` Philippe Mathieu-Daudé
2021-04-28 19:24       ` Richard Henderson
2021-04-28 19:34         ` Philippe Mathieu-Daudé
2021-04-28 15:15 ` [PATCH 0/2] virtiofsd: Meson build fixes Peter Maydell
2021-04-28 16:52   ` Dr. David Alan Gilbert

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=20210428144813.417170-2-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=berrange@redhat.com \
    --cc=ckuehl@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=ma.mandourr@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=virtio-fs@redhat.com \
    /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).