seccomp: libseccomp version varying according to arch
authorEduardo Otubo <eduardo.otubo@profitbricks.com>
Thu, 26 Mar 2015 15:56:25 +0000 (16:56 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Mar 2015 16:58:22 +0000 (16:58 +0000)
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>
configure

index cbe6495d52811491f3cc75d5a943df2614ea379a..09c922511cd0beeabd8530fd1ed36109336e8111 100755 (executable)
--- 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