aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Otubo <eduardo.otubo@profitbricks.com>2015-03-26 16:56:25 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-03-26 16:58:22 +0000
commit896848f0d3e2393905845ef2b244bb2601f9df0c (patch)
tree4c918854e6065ae9d943b0cc27b4db7f38d3d1c5
parent99b7f47c54ae7932715a1f58ed9a128451fb2b85 (diff)
downloadqemu-arm-896848f0d3e2393905845ef2b244bb2601f9df0c.tar.gz
seccomp: libseccomp version varying according to arch
Libseccomp dependency was mandating version 2.2.0 on all architectures and this was causing configure and virt-test to break on non-updates distros. This patch works-around it and give a more flexible way to check the version, giving more time for other distros to update libseccomp version. Signed-off-by: Eduardo Otubo <eduardo.otubo@profitbricks.com> Reported-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Tested-by: Juan Quintela <quintela@redhat.com> Message-id: 1427385385-30571-1-git-send-email-eduardo.otubo@profitbricks.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rwxr-xr-xconfigure8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure b/configure
index cbe6495d52..09c922511c 100755
--- a/configure
+++ b/configure
@@ -1848,13 +1848,19 @@ fi
# libseccomp check
if test "$seccomp" != "no" ; then
- if $pkg_config --atleast-version=2.2.0 libseccomp; then
+ if $pkg_config --atleast-version=2.2.0 libseccomp ||
+ (test "$cpu" = "i386" || test "$cpu" = "x86_64" &&
+ $pkg_config --atleast-version=2.1.1 libseccomp); then
libs_softmmu="$libs_softmmu `$pkg_config --libs libseccomp`"
QEMU_CFLAGS="$QEMU_CFLAGS `$pkg_config --cflags libseccomp`"
seccomp="yes"
else
if test "$seccomp" = "yes"; then
+ if test "$cpu" = "i386" || test "$cpu" = "x86_64"; then
+ feature_not_found "libseccomp" "Install libseccomp devel >= 2.1.1"
+ else
feature_not_found "libseccomp" "Install libseccomp devel >= 2.2.0"
+ fi
fi
seccomp="no"
fi