diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /package/qemu/Makefile | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'package/qemu/Makefile')
| -rw-r--r-- | package/qemu/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/package/qemu/Makefile b/package/qemu/Makefile index f82e852b8..69bc964c9 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu -PKG_VERSION:= 0.14.0 +PKG_VERSION:= 0.14.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= f9d145d5c09de9f0984ffe9bd1229970 +PKG_MD5SUM:= b6c713a8db638e173af53a62d5178640 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc PKG_DEPENDS:= zlib libsdl @@ -23,7 +23,6 @@ $(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_ TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIG_STYLE:= minimal CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ - --disable-user \ --prefix=/usr \ --sysconfdir=/etc \ --bindir=/usr/bin |