diff mbox

seccomp: libseccomp version varying according to arch

Message ID 1427385385-30571-1-git-send-email-eduardo.otubo@profitbricks.com
State New
Headers show

Commit Message

Eduardo Otubo March 26, 2015, 3:56 p.m. UTC
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>
---
 configure | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Juan Quintela March 26, 2015, 4:21 p.m. UTC | #1
Eduardo Otubo <eduardo.otubo@profitbricks.com> wrote:
> 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>
Peter Maydell March 26, 2015, 5:33 p.m. UTC | #2
On 26 March 2015 at 16:21, Juan Quintela <quintela@redhat.com> wrote:
> Eduardo Otubo <eduardo.otubo@profitbricks.com> wrote:
>> 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>

Applied to master, thanks.

-- PMM
diff mbox

Patch

diff --git a/configure b/configure
index cbe6495..09c9225 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