diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-26 11:10:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-26 11:10:54 +0000 |
| commit | 37a518ae5dc22415a642ce05423d71f8d7b25cac (patch) | |
| tree | 16984b231da6978ea24bf617af5fa7c2c784857c | |
| parent | 054903a832b865eb5432d79b5c9d1e1ff31b58d7 (diff) | |
| parent | 8e27fc200457e3f2473d0069263774d4ba17bd85 (diff) | |
| download | qemu-37a518ae5dc22415a642ce05423d71f8d7b25cac.zip qemu-37a518ae5dc22415a642ce05423d71f8d7b25cac.tar.gz qemu-37a518ae5dc22415a642ce05423d71f8d7b25cac.tar.bz2 | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 |