summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2013-07-30 13:40:19 +0000
committerIan Delaney <idella4@gentoo.org>2013-07-30 13:40:19 +0000
commit780da66139905c473e924fd022eb96bc69b6dcb2 (patch)
treeb0decc46617b0b8271153a11886b9d10866bba34
parentUpdate live ebuild to latest iteration of the ebuild (diff)
downloadgentoo-2-780da66139905c473e924fd022eb96bc69b6dcb2.tar.gz
gentoo-2-780da66139905c473e924fd022eb96bc69b6dcb2.tar.bz2
gentoo-2-780da66139905c473e924fd022eb96bc69b6dcb2.zip
extend xen-tools-4.2.2-install.patch with patch by D. Lan via Bug 478708, hopefully fixes the bug
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
-rw-r--r--app-emulation/xen-tools/ChangeLog7
-rw-r--r--app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch17
2 files changed, 22 insertions, 2 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 4a0dfa000e8d..a8dfe0d580de 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/xen-tools
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.187 2013/07/30 10:14:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.188 2013/07/30 13:40:19 idella4 Exp $
+
+ 30 Jul 2013; Ian Delaney <idella4@gentoo.org>
+ files/xen-tools-4.2.2-install.patch:
+ extend xen-tools-4.2.2-install.patch with patch by D. Lan via Bug 478708,
+ hopefully fixes the bug
30 Jul 2013; Ian Delaney <idella4@gentoo.org> files/xendomains-screen.confd:
Take out duplicate AUTODIR && PARALLEL_SHUTDOWN from xendomains-screen.confd
diff --git a/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch b/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch
index fd638f62e64c..e2715f89ff17 100644
--- a/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch
+++ b/app-emulation/xen-tools/files/xen-tools-4.2.2-install.patch
@@ -12,4 +12,19 @@ fix invalid installs of docs/man and config into /usr/local
--python=$(PYTHON) \
$(IOEMU_CONFIGURE_CROSS); \
$(MAKE) all
-
+diff --git a/tools/qemu-xen-traditional/configure b/tools/qemu-xen-traditional/configure
+index 904e019..b70ee25 100755
+--- a/tools/qemu-xen-traditional/configure
++++ b/tools/qemu-xen-traditional/configure
+@@ -1107,10 +1107,7 @@ elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lrt > /dev/null 2> /dev/null ; then
+ rt=yes
+ fi
+
+-if test "$rt" = "yes" ; then
+- # Hack, we should have a general purpose LIBS for this sort of thing
+- AIOLIBS="$AIOLIBS -lrt"
+-fi
++AIOLIBS="$AIOLIBS -lrt"
+
+ if test "$mingw32" = "yes" ; then
+ if test -z "$prefix" ; then