diff options
| -rw-r--r-- | main/qemu/APKBUILD | 17 | ||||
| -rw-r--r-- | main/qemu/configure-libm.patch | 60 | ||||
| -rw-r--r-- | main/qemu/librt.patch | 11 |
3 files changed, 7 insertions, 81 deletions
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index 5e133a2cab..8a5b143f8e 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu -pkgver=1.0.1 -pkgrel=2 +pkgver=1.1.0 +pkgrel=0 pkgdesc="QEMU is a generic machine emulator and virtualizer" -url="http://www.nongnu.org/qemu/" +url="http://qemu,org/" arch="all" license="GPL-2 LGPL-2" makedepends="zlib-dev sdl-dev alsa-lib-dev gnutls-dev ncurses-dev glib-dev @@ -36,10 +36,9 @@ $pkgname-xtensa $pkgname-xtensaeb $pkgname-img " -source="http://wiki.qemu.org/download/qemu-$pkgver.tar.gz +source="http://wiki.qemu.org/download/qemu-$pkgver-1.tar.bz2 80-kvm.rules - configure-libm.patch - librt.patch + 0001-configure-properly-check-if-lrt-and-lm-is-needed.patch " prepare() { @@ -68,7 +67,6 @@ build() { --audio-card-list=ac97,sb16,es1370,adlib \ --enable-vde \ --enable-spice \ - --disable-darwin-user \ --disable-bsd-user \ --disable-linux-user \ --disable-werror \ @@ -138,7 +136,6 @@ img() { return $_err } -md5sums="5efd1091f01e3bc31bfdec27b8edeb00 qemu-1.0.1.tar.gz +md5sums="f5c85c229b780bc39268845b6f365fc1 qemu-1.1.0-1.tar.bz2 66660f143235201249dc0648b39b86ee 80-kvm.rules -a69fe6ff552b61606c5550cac4294abc configure-libm.patch -9f6c3143d61748eedc8cf8d0e53aee2c librt.patch" +c8d39e6ac8e9e49bdf34efe652aae532 0001-configure-properly-check-if-lrt-and-lm-is-needed.patch" diff --git a/main/qemu/configure-libm.patch b/main/qemu/configure-libm.patch deleted file mode 100644 index e57216e53a..0000000000 --- a/main/qemu/configure-libm.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- ./configure.orig -+++ ./configure -@@ -1287,6 +1287,25 @@ - fi - - ########################################## -+# libm check -+cat > $TMPC << EOF -+#include <math.h> -+int main(void) { return isnan(0.0); } -+EOF -+ if compile_prog "" "" ; then -+ LIBM= -+ elif compile_prog "" "-lm" ; then -+ LIBM="-lm" -+ else -+ echo -+ echo "Error: libm check failed" -+ echo -+ exit 1 -+ fi -+ -+ -+ -+########################################## - # zlib check - - if test "$zlib" != "no" ; then ---- ./configure.orig -+++ ./configure -@@ -3283,6 +3283,7 @@ - echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak - echo "EXESUF=$EXESUF" >> $config_host_mak - echo "LIBS_QGA+=$libs_qga" >> $config_host_mak -+echo "LIBM=$LIBM" >> $config_host_mak - - # generate list of library paths for linker script - ---- ./Makefile.orig -+++ ./Makefile -@@ -170,7 +170,7 @@ - $(qapi-obj-y): $(GENERATED_HEADERS) - qapi-dir := $(BUILD_DIR)/qapi-generated - test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir) --qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) -+qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) $(LIBM) - - $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\ - $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py ---- ./Makefile.orig -+++ ./Makefile -@@ -34,7 +34,7 @@ - - $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw) - --LIBS+=-lz $(LIBS_TOOLS) -+LIBS+=-lz $(LIBS_TOOLS) $(LIBM) - - ifdef BUILD_DOCS - DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt diff --git a/main/qemu/librt.patch b/main/qemu/librt.patch deleted file mode 100644 index d445d1b68c..0000000000 --- a/main/qemu/librt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.target.orig -+++ ./Makefile.target -@@ -34,7 +34,7 @@ - STPFILES= - - ifndef CONFIG_HAIKU --LIBS+=-lm -+LIBS+=-lm -lrt - endif - - config-target.h: config-target.h-timestamp |