46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From 1783153157dfd7f2d647ecb29cfe600aaeab0179 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
|
||
|
|
Date: Tue, 14 Apr 2015 18:42:06 +0200
|
||
|
|
Subject: [PATCH] Revert "Revert seccomp tests that allow it to be used on
|
||
|
|
non-x86 architectures"
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This reverts commit ae6e8ef11e6cb43ec83a5846e8f3b266834cf280.
|
||
|
|
|
||
|
|
Our Factory libseccomp is patched to support ppc, ppc64, armv7l and soon
|
||
|
|
ppc64le.
|
||
|
|
|
||
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||
|
|
---
|
||
|
|
configure | 9 +++++++--
|
||
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure b/configure
|
||
|
|
index b43b371..7f31e89 100755
|
||
|
|
--- a/configure
|
||
|
|
+++ b/configure
|
||
|
|
@@ -1848,14 +1848,19 @@ fi
|
||
|
|
# libseccomp check
|
||
|
|
|
||
|
|
if test "$seccomp" != "no" ; then
|
||
|
|
- if test "$cpu" = "i386" || test "$cpu" = "x86_64" &&
|
||
|
|
- $pkg_config --atleast-version=2.1.1 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
|