Commit 37a518ae authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20150325' into staging



seccomp branch queue

# gpg: Signature made Wed Mar 25 10:09:29 2015 GMT using RSA key ID 12F8BD2F
# gpg: Can't check signature: public key not found

* remotes/otubo/tags/pull-seccomp-20150325:
  seccomp: update libseccomp version and remove arch restriction

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 054903a8 8e27fc20
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -1848,14 +1848,13 @@ 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; 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
            feature_not_found "libseccomp" "Install libseccomp devel >= 2.1.1"
            feature_not_found "libseccomp" "Install libseccomp devel >= 2.2.0"
	fi
	seccomp="no"
    fi