diff options
| -rw-r--r-- | package/qemu/Makefile | 21 | ||||
| -rw-r--r-- | package/qemu/patches/patch-pixman_Makefile_am | 8 | ||||
| -rw-r--r-- | package/qemu/patches/qemu-2.1.0-m68k.patch | 34 |
3 files changed, 2 insertions, 61 deletions
diff --git a/package/qemu/Makefile b/package/qemu/Makefile index aaf885400..cf17a671d 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= cpu and system emulator PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib glib alsa-lib PKG_BUILDDEP:= gettext-tiny alsa-lib zlib glib -HOST_BUILDDEP:= glib-host +HOST_BUILDDEP:= glib-host pkgconf-host PKG_URL:= http://wwww.qemu.org/ PKG_SITES:= http://wiki.qemu.org/download/ @@ -25,8 +25,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -HOST_CFLAGS+= -DNATIVE - ifeq ($(ADK_TARGET_LIB_MUSL),y) TARGET_CFLAGS+= -DF_EXLCK=4 -DF_SHLCK=8 -D__SIGRTMIN=32 -D__SIGRTMAX=\(NSIG-1\) endif @@ -60,30 +58,15 @@ CONFIGURE_ARGS+= --host-cc=$(HOST_CC) \ --disable-strip \ --bindir=/usr/bin -HOST_STYLE:= manual HOST_CONFIGURE_ARGS+= --host-cc=$(HOST_CC) \ - --prefix=${STAGING_HOST_DIR}/usr \ --disable-stack-protector \ --disable-pie \ --disable-docs \ --disable-werror \ --disable-system \ + --disable-gtk \ --disable-sdl -host-configure: - cd ${WRKBUILD}; rm -f config.{cache,status}; \ - env ${HOST_CONFIGURE_ENV} \ - ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ - ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) - -host-build: - cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ - ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) - -qemu-hostinstall: - cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ - ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) - qemu-install: $(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu $(INSTALL_DIR) $(IDIR_QEMU)/usr/bin diff --git a/package/qemu/patches/patch-pixman_Makefile_am b/package/qemu/patches/patch-pixman_Makefile_am deleted file mode 100644 index 7f5706549..000000000 --- a/package/qemu/patches/patch-pixman_Makefile_am +++ /dev/null @@ -1,8 +0,0 @@ ---- qemu-2.2.0.orig/pixman/Makefile.am 2014-12-09 15:46:29.000000000 +0100 -+++ qemu-2.2.0/pixman/Makefile.am 2015-01-01 16:42:09.000000000 +0100 -@@ -1,4 +1,4 @@ --SUBDIRS = pixman demos test -+SUBDIRS = pixman - - pkgconfigdir=$(libdir)/pkgconfig - pkgconfig_DATA=pixman-1.pc diff --git a/package/qemu/patches/qemu-2.1.0-m68k.patch b/package/qemu/patches/qemu-2.1.0-m68k.patch deleted file mode 100644 index b976c058b..000000000 --- a/package/qemu/patches/qemu-2.1.0-m68k.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- qemu-2.2.0.orig/hw/m68k/mcf_intc.c 2014-12-09 15:45:41.000000000 +0100 -+++ qemu-2.2.0/hw/m68k/mcf_intc.c 2014-12-31 21:02:29.000000000 +0100 -@@ -65,6 +65,10 @@ static uint64_t mcf_intc_read(void *opaq - return (uint32_t)(s->ifr >> 32); - case 0x14: - return (uint32_t)s->ifr; -+ /* Reading from SIMR and CIMR return 0 */ -+ case 0x1c: -+ case 0x1d: -+ return 0; - case 0xe0: /* SWIACK. */ - return s->active_vector; - case 0xe1: case 0xe2: case 0xe3: case 0xe4: -@@ -102,6 +106,20 @@ static void mcf_intc_write(void *opaque, - case 0x0c: - s->imr = (s->imr & 0xffffffff00000000ull) | (uint32_t)val; - break; -+ /* SIMR allows to easily mask interrupts */ -+ case 0x1c: -+ if (val & 0x40) -+ s->imr = ~0ull; -+ else -+ s->imr |= (1 << (val & 0x3f)); -+ break; -+ /* CIMR allows to easily unmask interrupts */ -+ case 0x1d: -+ if (val & 0x40) -+ s->imr = 0ull; -+ else -+ s->imr &= ~(1 << (val & 0x3f)); -+ break; - default: - hw_error("mcf_intc_write: Bad write offset %d\n", offset); - break; |