diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-11-08 18:55:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-11-08 18:55:30 +0000 |
| commit | f162532a93195f9da734563d1af1410e467ff2eb (patch) | |
| tree | cde3cc57f1997cd33b109cdf0d819ee09330ae1a /app-emulation | |
| parent | old (diff) | |
| download | gentoo-2-f162532a93195f9da734563d1af1410e467ff2eb.tar.gz gentoo-2-f162532a93195f9da734563d1af1410e467ff2eb.tar.bz2 gentoo-2-f162532a93195f9da734563d1af1410e467ff2eb.zip | |
Fix from upstream for building w/newer qemu #528386 by Reuben Martin.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/libguestfs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch | 27 |
2 files changed, 32 insertions, 1 deletions
diff --git a/app-emulation/libguestfs/ChangeLog b/app-emulation/libguestfs/ChangeLog index 18a6c0fa35e4..bfa7a4c91dd9 100644 --- a/app-emulation/libguestfs/ChangeLog +++ b/app-emulation/libguestfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/libguestfs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.35 2014/05/01 19:23:28 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.36 2014/11/08 18:55:30 vapier Exp $ + + 08 Nov 2014; Mike Frysinger <vapier@gentoo.org> + +files/1.26/0020_all_qemu_configure.patch: + Fix from upstream for building w/newer qemu #528386 by Reuben Martin. *libguestfs-1.26.1 (01 May 2014) diff --git a/app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch b/app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch new file mode 100644 index 000000000000..77423f73e8c9 --- /dev/null +++ b/app-emulation/libguestfs/files/1.26/0020_all_qemu_configure.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/528386 + +From 101d728e80cce73b882aac7af457013491d03311 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" <rjones@redhat.com> +Date: Tue, 22 Apr 2014 22:21:57 -0400 +Subject: [PATCH] configure: Make sure grep matches qemu 2.x version string. + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 34e4ddb..bb1a361 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -777,7 +777,7 @@ working. + fi + + AC_MSG_CHECKING([for $QEMU version >= 1]) +- if $QEMU -version | grep -sq 'version @<:@1-@:>@'; then ++ if $QEMU -version | grep -sq 'version @<:@1-9@:>@'; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +-- +2.1.3 + |