diff options
| author | adam <adam@pkgsrc.org> | 2012-09-13 14:38:19 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2012-09-13 14:38:19 +0000 |
| commit | 3853ca6621116c4ced18f7afc317b5640fc82cac (patch) | |
| tree | d6cb95f26331f2c87d1ab3bd66e18841bfd5999c /emulators/qemu/Makefile | |
| parent | d8c5f9de53823f7061870b6b52fb840b6bfa4a40 (diff) | |
| download | pkgsrc-3853ca6621116c4ced18f7afc317b5640fc82cac.tar.gz | |
Fixed building on Darwin; fixed building with Clang; fixed some pkglint issues
Diffstat (limited to 'emulators/qemu/Makefile')
| -rw-r--r-- | emulators/qemu/Makefile | 9 |
1 files changed, 4 insertions, 5 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} |