aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-04-10 13:58:01 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-04-13 12:28:48 +0100
commitae6e8ef11e6cb43ec83a5846e8f3b266834cf280 (patch)
treee89ece29d676c6ef517182f7e70832c350721441
parent4d0ecde44ae6dab3aa9d10c23e61d9d43789731a (diff)
downloadqemu-arm-ae6e8ef11e6cb43ec83a5846e8f3b266834cf280.tar.gz
Revert seccomp tests that allow it to be used on non-x86 architectures
Unfortunately it turns out that libseccomp 2.2 still does not work correctly on non-x86 architectures; return to the previous configure setup of insisting on libseccomp 2.1 or better and i386/x86_64 and disabling seccomp support in all other situations. This reverts the two commits: * "seccomp: libseccomp version varying according to arch" (commit 896848f0d3e2393905845ef2b244bb2601f9df0c) * "seccomp: update libseccomp version and remove arch restriction" (commit 8e27fc200457e3f2473d0069263774d4ba17bd85) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1428670681-23032-1-git-send-email-peter.maydell@linaro.org
-rwxr-xr-xconfigure9
1 files changed, 2 insertions, 7 deletions
diff --git a/configure b/configure
index 8b673fdc34..6969f6f449 100755
--- a/configure
+++ b/configure
@@ -1848,19 +1848,14 @@ fi
# libseccomp check
if test "$seccomp" != "no" ; 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
+ if 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