Sat Nov 20 14:37:42 2010 UTC ()
Disable bsd-user binaries on NetBSD 5.x and prior for workaround.

i386 and x86_64 user emul binaries require newer binutils for PROVIDE_HIDDEN()
 http://git.qemu.org/qemu.git/commit/?id=845f2c2812d9ed24b36c02a3d06ee83aeafe8b49
but on NetBSD binutils-2.19 was enabled around 5.99.22:
 http://cvsweb.NetBSD.org/bsdweb.cgi/src/share/mk/bsd.own.mk#rev1.594
and qemu-0.13.0 build fails on NetBSD 5.1 and 5.0.2.

Note qemu, qemu-system-x86_64, and other non user binaries
(that would actually be required by most users) still work fine.


(tsutsui)
diff -r1.75 -r1.76 pkgsrc/emulators/qemu/Makefile
cvs diff -r1.75 -r1.76 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2010/11/09 10:37:12 1.75
+++ pkgsrc/emulators/qemu/Makefile 2010/11/20 14:37:42 1.76
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.75 2010/11/09 10:37:12 jmmv Exp $ 1# $NetBSD: Makefile,v 1.76 2010/11/20 14:37:42 tsutsui Exp $
2# 2#
3 3
4DISTNAME= qemu-0.13.0 4DISTNAME= qemu-0.13.0
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= emulators 6CATEGORIES= emulators
7MASTER_SITES= http://download.savannah.gnu.org/releases/qemu/ 7MASTER_SITES= http://download.savannah.gnu.org/releases/qemu/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu.org/ 10HOMEPAGE= http://www.qemu.org/
11COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -63,27 +63,40 @@ SUBST_SED.qaudio= -e s,audio.h\",qaudio. @@ -63,27 +63,40 @@ SUBST_SED.qaudio= -e s,audio.h\",qaudio.
63SUBST_MESSAGE.qaudio= Fixing audio.h confusion 63SUBST_MESSAGE.qaudio= Fixing audio.h confusion
64 64
65REPLACE_PERL+= texi2pod.pl 65REPLACE_PERL+= texi2pod.pl
66 66
67BUILDLINK_PASSTHRU_DIRS+= /usr/lib 67BUILDLINK_PASSTHRU_DIRS+= /usr/lib
68BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib 68BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib
69 69
70INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu 70INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
71 71
72UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel 72UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel
73UE_ARCHS+= ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus 73UE_ARCHS+= ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus
74UE_ARCHS+= sparc64 x86_64 74UE_ARCHS+= sparc64 x86_64
75 75
76.if !empty(OPSYS:M*BSD) || !empty(OPSYS:MDragonFly) 76.if ${OPSYS} == "NetBSD"
 77.if (!empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6-9].*))
 78# XXX
 79# i386 and x86_64 user emul require newer binutils for PROVIDE_HIDDEN()
 80# http://git.qemu.org/qemu.git/commit/?id=845f2c2812d9ed24b36c02a3d06ee83aeafe8b49
 81# but binutils-2.19 was enabled around 5.99.22:
 82# http://cvsweb.NetBSD.org/bsdweb.cgi/src/share/mk/bsd.own.mk#rev1.594
 83USER_EMUL= i386 x86_64 sparc sparc64
 84.else
 85CONFIGURE_ARGS+= --disable-bsd-user
 86USER_EMUL=
 87.endif
 88PLIST.nbd= YES
 89.elif !empty(OPSYS:M*BSD) || !empty(OPSYS:MDragonFly)
77USER_EMUL= i386 x86_64 sparc sparc64 90USER_EMUL= i386 x86_64 sparc sparc64
78PLIST.nbd= YES 91PLIST.nbd= YES
79.elif !empty(OPSYS:MDarwin) 92.elif !empty(OPSYS:MDarwin)
80USER_EMUL= i386 x86_64 sparc sparc64 ppc 93USER_EMUL= i386 x86_64 sparc sparc64 ppc
81.elif !empty(OPSYS:MLinux) 94.elif !empty(OPSYS:MLinux)
82USER_EMUL= ${UE_ARCHS} 95USER_EMUL= ${UE_ARCHS}
83PLIST.nbd= YES 96PLIST.nbd= YES
84.endif 97.endif
85 98
86PLIST_VARS+= ${UE_ARCHS} nbd 99PLIST_VARS+= ${UE_ARCHS} nbd
87.for _var_ in ${USER_EMUL} 100.for _var_ in ${USER_EMUL}
88PLIST.${_var_}= YES 101PLIST.${_var_}= YES
89.endfor 102.endfor