OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Revert seccomp tests that allow it to be used on non-x86 architectures

Browse Source 
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 896848f0d3)
 * "seccomp: update libseccomp version and remove arch restriction"
   (commit 8e27fc2004)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1428670681-23032-1-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2015-04-10 13:58:01 +01:00
parent 4d0ecde44a
commit ae6e8ef11e
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -1848,19 +1848,14 @@ fi
# libseccomp check # libseccomp check
if test "$seccomp" != "no" ; then if test "$seccomp" != "no" ; then
if $pkg_config --atleast-version=2.2.0 libseccomp || if test "$cpu" = "i386" || test "$cpu" = "x86_64" &&
(test "$cpu" = "i386" || test "$cpu" = "x86_64" && $pkg_config --atleast-version=2.1.1 libseccomp; then
$pkg_config --atleast-version=2.1.1 libseccomp); then
libs_softmmu="$libs_softmmu `$pkg_config --libs libseccomp`" libs_softmmu="$libs_softmmu `$pkg_config --libs libseccomp`"
QEMU_CFLAGS="$QEMU_CFLAGS `$pkg_config --cflags libseccomp`" QEMU_CFLAGS="$QEMU_CFLAGS `$pkg_config --cflags libseccomp`"
seccomp="yes" seccomp="yes"
else else
if test "$seccomp" = "yes"; then if test "$seccomp" = "yes"; then
if test "$cpu" = "i386" || test "$cpu" = "x86_64"; then
feature_not_found "libseccomp" "Install libseccomp devel >= 2.1.1" feature_not_found "libseccomp" "Install libseccomp devel >= 2.1.1"
else
feature_not_found "libseccomp" "Install libseccomp devel >= 2.2.0"
fi
fi fi
seccomp="no" seccomp="no"
fi fi