Tue Mar 24 15:13:40 2009 UTC ()
Workaround for PR/41007 - ensure WRKSRC comes before any buildlinked
directories so we pickup our audio/audio.h. Cannot use CPPFLAGS for this.
    CFLAGS+= -I${WRKSRC}


(abs)
diff -r1.54 -r1.55 pkgsrc/emulators/qemu/Makefile
cvs diff -r1.54 -r1.55 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2009/01/22 07:27:28 1.54
+++ pkgsrc/emulators/qemu/Makefile 2009/03/24 15:13:40 1.55
@@ -1,34 +1,38 @@ @@ -1,34 +1,38 @@
1# $NetBSD: Makefile,v 1.54 2009/01/22 07:27:28 jmmv Exp $ 1# $NetBSD: Makefile,v 1.55 2009/03/24 15:13:40 abs Exp $
2# 2#
3 3
4DISTNAME= qemu-0.9.1 4DISTNAME= qemu-0.9.1
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= http://bellard.org/qemu/ 6MASTER_SITES= http://bellard.org/qemu/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://bellard.org/qemu/ 9HOMEPAGE= http://bellard.org/qemu/
10COMMENT= CPU emulator using dynamic translation 10COMMENT= CPU emulator using dynamic translation
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14CONFLICTS+= qemu-bin-[0-9]* 14CONFLICTS+= qemu-bin-[0-9]*
15NOT_FOR_PLATFORM= NetBSD-1.[0-6]*-* 15NOT_FOR_PLATFORM= NetBSD-1.[0-6]*-*
16 16
17USE_TOOLS+= gmake perl:build 17USE_TOOLS+= gmake perl:build
18HAS_CONFIGURE= yes 18HAS_CONFIGURE= yes
19 19
20BUILD_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html 20BUILD_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html
21 21
 22# Workaround for PR/41007 - ensure WRKSRC comes before any buildlinked
 23# directories so we pickup our audio/audio.h. Cannot use CPPFLAGS for this
 24CFLAGS+= -I${WRKSRC}
 25
22.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
23 27
24GCC_REQD+= 3.0 28GCC_REQD+= 3.0
25 29
26.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*) 30.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*)
27USE_PKGSRC_GCC= yes 31USE_PKGSRC_GCC= yes
28.endif 32.endif
29 33
30CONFIGURE_ENV+= PKGMANDIR=${PKGMANDIR} 34CONFIGURE_ENV+= PKGMANDIR=${PKGMANDIR}
31CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 35CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
32CONFIGURE_ARGS+= --interp-prefix=${PREFIX:Q}/share/qemu 36CONFIGURE_ARGS+= --interp-prefix=${PREFIX:Q}/share/qemu
33 37
34.if !empty(MACHINE_PLATFORM:MNetBSD-*) 38.if !empty(MACHINE_PLATFORM:MNetBSD-*)
@@ -61,25 +65,26 @@ BUILDLINK_PASSTHRU_DIRS+= /usr/lib @@ -61,25 +65,26 @@ BUILDLINK_PASSTHRU_DIRS+= /usr/lib
61BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib 65BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib
62 66
63# Does not build with the stack protector 67# Does not build with the stack protector
64.if ${OPSYS} == "DragonFly" 68.if ${OPSYS} == "DragonFly"
65CFLAGS+= -fno-stack-protector 69CFLAGS+= -fno-stack-protector
66.endif 70.endif
67 71
68.include "../../mk/compiler.mk" 72.include "../../mk/compiler.mk"
69 73
70.if !empty(CC_VERSION:Mgcc-4*) 74.if !empty(CC_VERSION:Mgcc-4*)
71CONFIGURE_ARGS+= --disable-gcc-check 75CONFIGURE_ARGS+= --disable-gcc-check
72.endif 76.endif
73 77
 78
74INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu 79INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
75 80
76post-install: 81post-install:
77 ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \ 82 ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
78 ${DESTDIR}${PREFIX}/share/doc/qemu/ 83 ${DESTDIR}${PREFIX}/share/doc/qemu/
79 ${INSTALL_MAN} ${WRKSRC}/qemu.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 84 ${INSTALL_MAN} ${WRKSRC}/qemu.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
80 ${INSTALL_MAN} ${WRKSRC}/qemu-img.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 85 ${INSTALL_MAN} ${WRKSRC}/qemu-img.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
81 86
82.include "../../devel/SDL/buildlink3.mk" 87.include "../../devel/SDL/buildlink3.mk"
83.include "../../mk/oss.buildlink3.mk" 88.include "../../mk/oss.buildlink3.mk"
84.include "../../mk/pthread.buildlink3.mk" 89.include "../../mk/pthread.buildlink3.mk"
85.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"