diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-02 09:34:42 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-02 09:34:42 +0000 |
| commit | c1ab71f15e62515c6aa3c10822be0e64744a1254 (patch) | |
| tree | 3e51d64a9b8957929a2a66f4f0afd6bf711fb1e9 /main | |
| parent | 742ec6824d8aebafacc1f784bcb42adbcc919a57 (diff) | |
| download | aports-c1ab71f15e62515c6aa3c10822be0e64744a1254.tar.bz2 aports-c1ab71f15e62515c6aa3c10822be0e64744a1254.tar.xz | |
main/qemu: upgrade to 1.0
Diffstat (limited to 'main')
| -rw-r--r-- | main/qemu/APKBUILD | 13 | ||||
| -rw-r--r-- | main/qemu/configure-libm.patch | 60 | ||||
| -rw-r--r-- | main/qemu/qemu-libm.patch | 11 |
3 files changed, 68 insertions, 16 deletions
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index 40796f7fe9..84e3d19f54 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu -pkgver=0.15.1 +pkgver=1.0 pkgrel=0 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://www.nongnu.org/qemu/" @@ -13,6 +13,7 @@ install="qemu.pre-install" subpackages=" $pkgname-arm $pkgname-cris +$pkgname-i386 $pkgname-lm32 $pkgname-m68k $pkgname-microblaze @@ -34,7 +35,7 @@ $pkgname-img " source="http://wiki.qemu.org/download/qemu-$pkgver.tar.gz 80-kvm.rules - qemu-libm.patch + configure-libm.patch " prepare() { @@ -66,7 +67,8 @@ build() { --disable-bsd-user \ --disable-linux-user \ --disable-werror \ - --cc="${CC:-gcc}" + --cc="${CC:-gcc}" \ + || return 1 make V=1 || return 1 } @@ -87,6 +89,7 @@ _subsys() { arm() { _subsys arm; } cris() { _subsys cris; } +i386() { _subsys i386; } lm32() { _subsys lm32; } m68k() { _subsys m68k; } microblaze() { _subsys microblaze; } @@ -114,6 +117,6 @@ img() { "$subpkgdir"/usr/bin/ } -md5sums="34f17737baaf1b3495c89cd6d4a607ed qemu-0.15.1.tar.gz +md5sums="a64b36067a191451323b0d34ebb44954 qemu-1.0.tar.gz 66660f143235201249dc0648b39b86ee 80-kvm.rules -70a4336c31600ce00838b056f0d08452 qemu-libm.patch" +a69fe6ff552b61606c5550cac4294abc configure-libm.patch" diff --git a/main/qemu/configure-libm.patch b/main/qemu/configure-libm.patch new file mode 100644 index 0000000000..e57216e53a --- /dev/null +++ b/main/qemu/configure-libm.patch @@ -0,0 +1,60 @@ +--- ./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/qemu-libm.patch b/main/qemu/qemu-libm.patch deleted file mode 100644 index c7f0db707b..0000000000 --- a/main/qemu/qemu-libm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.orig -+++ ./Makefile -@@ -29,7 +29,7 @@ - - $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw) - --LIBS+=-lz $(LIBS_TOOLS) -+LIBS+=-lm -lz $(LIBS_TOOLS) - - ifdef BUILD_DOCS - DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt |