Fixed building on Darwin; fixed building with Clang; fixed some pkglint issues

4 files changed, 25 insertions, 10 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 71f96d2216c..7fbe1080e65 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2012/09/11 17:13:44 asau Exp $
+# $NetBSD: Makefile,v 1.97 2012/09/13 14:38:19 adam Exp $
 
 DISTNAME=		qemu-1.2.0
 CATEGORIES=		emulators
@@ -86,17 +86,17 @@ UE_ARCHS+=		ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus
 UE_ARCHS+=		sparc64 x86_64 microblazeel s390x unicore32
 
 .if ${OPSYS} == "NetBSD"
-.if (!empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6-9].*))
+.  if (!empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6-9].*))
 # XXX
 # i386 and x86_64 user emul require newer binutils for PROVIDE_HIDDEN()
 # http://git.qemu.org/qemu.git/commit/?id=845f2c2812d9ed24b36c02a3d06ee83aeafe8b49
 # but binutils-2.19 was enabled around 5.99.22:
 # http://cvsweb.NetBSD.org/bsdweb.cgi/src/share/mk/bsd.own.mk#rev1.594
 USER_EMUL=		i386 x86_64 sparc sparc64
-.else
+.  else
 CONFIGURE_ARGS+=	--disable-bsd-user
 USER_EMUL=
-.endif
+.  endif
 PLIST.nbd=		YES
 .elif !empty(OPSYS:M*BSD) || !empty(OPSYS:MDragonFly)
 USER_EMUL=		i386 x86_64 sparc sparc64
@@ -104,7 +104,6 @@ PLIST.nbd=		YES
 .elif !empty(OPSYS:MDarwin)
 USER_EMUL=
 CONFIGURE_ARGS+=	--disable-bsd-user
-CONFIGURE_ARGS+=	--disable-darwin-user
 PLIST.nbd=		YES
 .elif !empty(OPSYS:MLinux)
 USER_EMUL=		${UE_ARCHS}
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index a2b3eae45fa..40f1e25845f 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2012/09/11 17:13:44 asau Exp $
+@comment $NetBSD: PLIST,v 1.31 2012/09/13 14:38:19 adam Exp $
 ${PLIST.alpha}bin/qemu-alpha
 ${PLIST.arm}bin/qemu-arm
 ${PLIST.armeb}bin/qemu-armeb
@@ -60,9 +60,6 @@ share/examples/qemu/cpus-x86_64.conf
 share/examples/qemu/target-x86_64.conf
 share/qemu/bamboo.dtb
 share/qemu/bios.bin
-share/qemu/kvmvapic.bin
-share/qemu/palcode-clipper
-share/qemu/sgabios.bin
 share/qemu/keymaps/ar
 share/qemu/keymaps/bepo
 share/qemu/keymaps/common
@@ -99,11 +96,13 @@ share/qemu/keymaps/sl
 share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
+share/qemu/kvmvapic.bin
 share/qemu/linuxboot.bin
 share/qemu/multiboot.bin
 share/qemu/openbios-ppc
 share/qemu/openbios-sparc32
 share/qemu/openbios-sparc64
+share/qemu/palcode-clipper
 share/qemu/petalogix-ml605.dtb
 share/qemu/petalogix-s3adsp1800.dtb
 share/qemu/ppc_rom.bin
@@ -115,6 +114,7 @@ share/qemu/pxe-rtl8139.rom
 share/qemu/pxe-virtio.rom
 share/qemu/qemu-icon.bmp
 share/qemu/s390-zipl.rom
+share/qemu/sgabios.bin
 share/qemu/slof.bin
 share/qemu/spapr-rtas.bin
 share/qemu/vgabios-cirrus.bin
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index eb3f8197d90..7d1a44f339c 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.78 2012/09/11 17:13:44 asau Exp $
+$NetBSD: distinfo,v 1.79 2012/09/13 14:38:19 adam Exp $
 
 SHA1 (qemu-1.2.0.tar.bz2) = 4bbfb35ca2e386e9b731c09a8eb1187c0c0795a8
 RMD160 (qemu-1.2.0.tar.bz2) = f6ebeeca42e2e694f17ab83cca3652baf7e74d1c
 Size (qemu-1.2.0.tar.bz2) = 9865186 bytes
 SHA1 (patch-configure) = 34ae5e65bc5beb45637303a02c42e9ede33564b6
+SHA1 (patch-dyngen-exec.h) = c175c9db5521da5f61239bea3f9b150188ddc448
 SHA1 (patch-ef) = fd9f0ca22b1f3c3950a0ea69ba32252265d2285a
 SHA1 (patch-eg) = 4be8e74d134e0736fa65977d885a9dd3b12e653b
 SHA1 (patch-eh) = 02ada323ac9ba0acf8e4d0746bc7d58abb24b288
diff --git a/emulators/qemu/patches/patch-dyngen-exec.h b/emulators/qemu/patches/patch-dyngen-exec.h
new file mode 100644
index 00000000000..734cc82a544
--- /dev/null
+++ b/emulators/qemu/patches/patch-dyngen-exec.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-dyngen-exec.h,v 1.1 2012/09/13 14:38:19 adam Exp $
+
+Register variables can't be global.
+
+--- dyngen-exec.h.orig	2012-09-13 12:10:52.000000000 +0000
++++ dyngen-exec.h
+@@ -61,7 +61,7 @@
+ #endif
+ 
+ #if defined(AREG0)
+-register CPUArchState *env asm(AREG0);
++CPUArchState *env asm(AREG0);
+ #else
+ /* TODO: Try env = cpu_single_env. */
+ extern CPUArchState *env;