[arch-commits] CVS update of extra/emulators/qemu (PKGBUILD)

[Tobias Powalowski]

    Date: Monday, July 9, 2007 @ 18:28:01
  Author: tpowa
    Path: /home/cvs-extra/extra/emulators/qemu

Modified: PKGBUILD (1.7 -> 1.8)

'upgpkg: added kvm stuff'


----------+
 PKGBUILD |   28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)


Index: extra/emulators/qemu/PKGBUILD
diff -u extra/emulators/qemu/PKGBUILD:1.7 extra/emulators/qemu/PKGBUILD:1.8
--- extra/emulators/qemu/PKGBUILD:1.7	Tue Jun 12 14:36:27 2007
+++ extra/emulators/qemu/PKGBUILD	Mon Jul  9 18:28:01 2007
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD,v 1.7 2007/06/12 18:36:27 alexander Exp $
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
+# $Id: PKGBUILD,v 1.8 2007/07/09 22:28:01 tpowa Exp $
+# Maintainer: Thomas B�chler <thomas at archlinux.org>
 pkgname=qemu
 pkgver=0.9.0
-pkgrel=3
+pkgrel=4
 pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://fabrice.bellard.free.fr/qemu/"
 depends=('sdl' 'alsa-lib' 'zlib')
-[ "${CARCH}" = "x86_64" ] && depends=(${depends[@]} 'kvm-modules')
-makedepends=('gcc3')
+makedepends=('gcc34')
+install=qemu.install
 source=(http://fabrice.bellard.free.fr/qemu/${pkgname}-${pkgver}.tar.gz \
         70-kqemu.rules \
         http://downloads.sourceforge.net/kvm/kvm-28.tar.gz)
@@ -24,7 +24,9 @@
      # any "xxx-user" target seems to not build on x86_64
          ./configure --prefix=/usr --enable-alsa \
                      --target-list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu arm-softmmu mips-softmmu" \
-    else ./configure --prefix=/usr --enable-alsa
+                     --qemu-cc=gcc-3.4
+  else 
+         ./configure --prefix=/usr --enable-alsa --qemu-cc=gcc-3.4
   fi
 
   make || return 1
@@ -32,19 +34,15 @@
   install -D -m644 ${startdir}/src/70-kqemu.rules \
                    ${startdir}/pkg/etc/udev/rules.d/70-kqemu.rules
 
-  # we add the kvm/qemu version on x86_64 only for now
-  if [ ${CARCH} = "x86_64" ]; then
+  # we add the kvm/qemu version
     cd ${startdir}/src/kvm-28
-    ./configure --prefix=/usr \
-                --qemu-cc=gcc-3.3
+    ./configure --prefix=/usr --qemu-cc=gcc-3.4
 
     for dir in user qemu; do
       cd ${startdir}/src/kvm-28/${dir}
       make || return 1
     done
-
-    install -m 755 ${startdir}/src/kvm-28/qemu/x86_64-softmmu/qemu-system-x86_64 \
-                   ${startdir}/pkg/usr/bin/qemu-system-x86_64-kvm
-
-  fi
+   # install kvm-qemu
+   install -m 755 ${startdir}/src/kvm-28/qemu/i386-softmmu/qemu \
+                   ${startdir}/pkg/usr/bin/qemu-kvm
 }