diff options
| -rw-r--r-- | app-emulation/qemu/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/qemu/files/qemu-9999-fix-mipsen.patch | 18 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 3 |
3 files changed, 6 insertions, 21 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog index cd98e10b2a2b..b556f6f435cb 100644 --- a/app-emulation/qemu/ChangeLog +++ b/app-emulation/qemu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.150 2012/12/04 10:20:45 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.151 2012/12/05 15:38:27 slyfox Exp $ + + 05 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> + -files/qemu-9999-fix-mipsen.patch, qemu-9999.ebuild: + Drop mips patch as fix gone upstream. 04 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild: Follow upstream bump of minimal spice protocol versions. diff --git a/app-emulation/qemu/files/qemu-9999-fix-mipsen.patch b/app-emulation/qemu/files/qemu-9999-fix-mipsen.patch deleted file mode 100644 index 02a9a22e8aa7..000000000000 --- a/app-emulation/qemu/files/qemu-9999-fix-mipsen.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fixes link failure due to missing piix symbols. - - LINK mips-softmmu/qemu-system-mips -hw/mips/../mips_malta.o: In function `mips_malta_init': -mips_malta.c:(.text+0x2314): undefined reference to `piix4_pm_init' -collect2: error: ld returned 1 exit status -diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs -index 29a5d0d..89af0e9 100644 ---- a/hw/mips/Makefile.objs -+++ b/hw/mips/Makefile.objs -@@ -1,6 +1,7 @@ - obj-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o - obj-y += mips_addr.o mips_timer.o mips_int.o - obj-y += gt64xxx.o mc146818rtc.o -+obj-y += acpi.o acpi_piix4.o - obj-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o - - obj-y := $(addprefix ../,$(obj-y)) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index bacb4593c4ca..a992cd617f01 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.35 2012/12/04 10:20:45 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.36 2012/12/05 15:38:27 slyfox Exp $ EAPI="4" @@ -190,7 +190,6 @@ src_prepare() { python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat" epatch "${FILESDIR}"/qemu-1.2.0-cflags.patch - epatch "${FILESDIR}"/${P}-fix-mipsen.patch [[ -n ${BACKPORTS} ]] && \ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ epatch |